From patchwork Wed Apr 3 03:43:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161663 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2517983jan; Tue, 2 Apr 2019 20:56:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqybGKCnED5KXrFXz30PR4kfkIblMBOjAmhcwy6aAVBxl8hkMRWPKJj5G9rXBqLJr8LVbeIG X-Received: by 2002:a0d:df83:: with SMTP id i125mr44883991ywe.94.1554263784971; Tue, 02 Apr 2019 20:56:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554263784; cv=none; d=google.com; s=arc-20160816; b=CW9doyn/xHhQJrqUD6vEYJo2YNPkVn3eUxwOg7Ee7j3IXn7cahrMuNuZYNj358nrnC EeJQG1v89vViyXIY78s6NsqJ3VaBcsfDeBJ8BPAeZjx7u2MiCoTVdn+RgdyRgUS0lfOG OaD+aTAMH9GQLMrkV6fMOAPQB0CZKnaFb5m7eHFr0ML19QTMbfCIFWqmAl+IMkp0nXnP nDCzhcUwIa89OB5cla+2bHl5A0nSx3AfnMjoTQp3N9k66TLvlx31TfbqeLcGWZpLpQ6+ zjjU6456H9d7KgyEsalFE3ZOBZhRC60e7LMRe389Gt8+Kxu7fA57+qnyQwTEgvPplrek 3W2A== 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=384FujFXDMGyrNVbgb6dXYKV7liMukTd1wxhqjqEOUQ=; b=e89fPaJ8qq/b/JTuLzrhp527b6/RWp0DiL8IV8IpygmEIvq+PgpbEIUOnfyHXLEZLH mUWk+sUqWbTD7NhWPtKg5DLwdL468LU9NeKz8g0/5VSoWNv5WY/nX3Ft2EWB6tDJl5V2 lQfcVLHR+b0pGF0Arn3CfSJyFePwCUCLp6DFONNtoYu/Pqb//kCRlCCDKiPnFB87NnTK DmkZOzJfZLOXq2tuQNCDCF+3KvCmuQi+egbBELXUUwRY5yBcXAdYWLc/A3V8iGM4zhS5 p9OKnpBeFnsQc/xVzPlkS9O3QgFOYFY+zGXSzXYnMRU3nIsRf/6J120V2mwqrtZcj7aK QKBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cdyH4SeE; 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 l18si5374279ywl.434.2019.04.02.20.56.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 02 Apr 2019 20:56:24 -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=cdyH4SeE; 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]:54239 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBX0i-00051v-GU for patch@linaro.org; Tue, 02 Apr 2019 23:56:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBWpF-0002xF-6j for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBWpD-0008S8-VL for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:33 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:33028) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hBWpD-0008RC-MO for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:31 -0400 Received: by mail-pf1-x444.google.com with SMTP id i19so7434164pfd.0 for ; Tue, 02 Apr 2019 20:44:31 -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=384FujFXDMGyrNVbgb6dXYKV7liMukTd1wxhqjqEOUQ=; b=cdyH4SeEE+9MxMkoVB7zwzW205n8YwexjlE6t5MAABK9nQrbha1xPjHhgFn8SyokQ+ ifopZPNiOkOdpizB2m9JEdSi6fRkh9Qew/Y0f+XHUmnV+BasSfCYjA3s1T8Xbxw4K9xf 3Oha9YYUEAClaEjkX5+lzU4L1G64jJX5RGbSLgz33UJidsrt1y9eD8WVkoTFSA+YXDF1 jfmpIP3WH1FUAXAGzBrUUXTeGQ6QIZeSh6ke8lPibyNeEhv8MgXNxXYMJkWSi1qE1U5g 1p8AY5QU4Mpp1wR3kYa3Q4hLHf/g7tvcPYKd3bpI5PQd4ZHdhWkF5prWbVFYu7ay4Pl4 9xTg== 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=384FujFXDMGyrNVbgb6dXYKV7liMukTd1wxhqjqEOUQ=; b=CoJES2PVzR4gMvesx+/xQA13KzhEWRIjLhY3ggHrnU/q05PgPEnAJpNBjbMuw9j0C6 jDuAxdRCIW9hxZwqmxjpkzDXYAWeIe22/8TwhodTkS0BnqQ09xJhsBRwmruHut7oxWJu GOZ8EEGR4hI9llqNnHVpJhbJRr94y+1VvO5rpZ2JjteraJ3iNPWgGQN4z18NZSU4H9r9 XdSIik2FDRcWFNttfGfTRM0O+UQypGh+SNCWguWj5fWwRyGChdRfZ7z8I0g/MjMP6AH6 4VjRC7HNH2lGeTLj9L1neqVn0+vTyW9ixvcurqXxIAyWzgQaJ/q3Kb6ky3RjDgpgb4kk HPRQ== X-Gm-Message-State: APjAAAWanDzNqxp/iVuw1zscpGfmGcPeWwsOg2Z0BhhCCHba2fnWisR3 RSX/GRL1ghoTSWonVjUqMa4q0K41U5vWgQ== X-Received: by 2002:a62:2587:: with SMTP id l129mr16139724pfl.151.1554263070458; Tue, 02 Apr 2019 20:44:30 -0700 (PDT) Received: from cloudburst.imgcgcw.net ([147.50.13.10]) by smtp.gmail.com with ESMTPSA id z6sm26753214pgo.31.2019.04.02.20.44.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 20:44:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2019 10:43:46 +0700 Message-Id: <20190403034358.21999-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190403034358.21999-1-richard.henderson@linaro.org> References: <20190403034358.21999-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::444 Subject: [Qemu-devel] [PATCH 14/26] target/openrisc: 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: Stafford Horne Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Stafford Horne Signed-off-by: Richard Henderson --- target/openrisc/cpu.h | 5 ++-- target/openrisc/cpu.c | 5 ++-- target/openrisc/mmu.c | 65 ++++++++++++++++++++++--------------------- 3 files changed, 39 insertions(+), 36 deletions(-) -- 2.17.1 Reviewed-by: Peter Maydell diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index f1b31bc24a..cbd7c97230 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -345,8 +345,9 @@ hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); int openrisc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); int openrisc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void openrisc_translate_init(void); -int openrisc_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, - int rw, int mmu_idx); +bool openrisc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); int cpu_openrisc_signal_handler(int host_signum, void *pinfo, void *puc); int print_insn_or1k(bfd_vma addr, disassemble_info *info); diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 541b2a66c7..d38cd24275 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -148,9 +148,8 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = openrisc_cpu_set_pc; cc->gdb_read_register = openrisc_cpu_gdb_read_register; cc->gdb_write_register = openrisc_cpu_gdb_write_register; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = openrisc_cpu_handle_mmu_fault; -#else + cc->tlb_fill = openrisc_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = openrisc_cpu_get_phys_page_debug; dc->vmsd = &vmstate_openrisc_cpu; #endif diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index e7d5219e11..991f3fafe8 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -107,16 +107,42 @@ static void raise_mmu_exception(OpenRISCCPU *cpu, target_ulong address, cpu->env.lock_addr = -1; } -int openrisc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, - int rw, int mmu_idx) +bool openrisc_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { -#ifdef CONFIG_USER_ONLY OpenRISCCPU *cpu = OPENRISC_CPU(cs); - raise_mmu_exception(cpu, address, EXCP_DPF); - return 1; -#else - g_assert_not_reached(); + int excp = EXCP_DPF; + +#ifndef CONFIG_USER_ONLY + int prot; + hwaddr phys_addr; + + if (mmu_idx == MMU_NOMMU_IDX) { + /* The mmu is disabled; lookups never fail. */ + get_phys_nommu(&phys_addr, &prot, addr); + excp = 0; + } else { + bool super = mmu_idx == MMU_SUPERVISOR_IDX; + int need = (access_type == MMU_INST_FETCH ? PAGE_EXEC + : access_type == MMU_DATA_STORE ? PAGE_WRITE + : PAGE_READ); + excp = get_phys_mmu(cpu, &phys_addr, &prot, addr, need, super); + } + + if (likely(excp == 0)) { + tlb_set_page(cs, addr & TARGET_PAGE_MASK, + phys_addr & TARGET_PAGE_MASK, prot, + mmu_idx, TARGET_PAGE_SIZE); + return true; + } + if (probe) { + return false; + } #endif + + raise_mmu_exception(cpu, addr, excp); + cpu_loop_exit_restore(cs, retaddr); } #ifndef CONFIG_USER_ONLY @@ -156,29 +182,6 @@ hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) void tlb_fill(CPUState *cs, target_ulong addr, int size, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { - OpenRISCCPU *cpu = OPENRISC_CPU(cs); - int prot, excp; - hwaddr phys_addr; - - if (mmu_idx == MMU_NOMMU_IDX) { - /* The mmu is disabled; lookups never fail. */ - get_phys_nommu(&phys_addr, &prot, addr); - excp = 0; - } else { - bool super = mmu_idx == MMU_SUPERVISOR_IDX; - int need = (access_type == MMU_INST_FETCH ? PAGE_EXEC - : access_type == MMU_DATA_STORE ? PAGE_WRITE - : PAGE_READ); - excp = get_phys_mmu(cpu, &phys_addr, &prot, addr, need, super); - } - - if (unlikely(excp)) { - raise_mmu_exception(cpu, addr, excp); - cpu_loop_exit_restore(cs, retaddr); - } - - tlb_set_page(cs, addr & TARGET_PAGE_MASK, - phys_addr & TARGET_PAGE_MASK, prot, - mmu_idx, TARGET_PAGE_SIZE); + openrisc_cpu_tlb_fill(cs, addr, size, access_type, mmu_idx, 0, retaddr); } #endif