From patchwork Wed Apr 3 03:43:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 161669 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2521352jan; Tue, 2 Apr 2019 21:01:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOcb0KyllnCOFP4xcbZLuGa1ZJ+WxF6gIYumk+4KRF1ooIxfdjx8FWX7njjYuMvR2JWuT8 X-Received: by 2002:a25:ba8f:: with SMTP id s15mr36928727ybg.411.1554264098678; Tue, 02 Apr 2019 21:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554264098; cv=none; d=google.com; s=arc-20160816; b=UHfyXI8vdV8QhMT5AcVEMFX5whC29v2+OeKlsuD0RRlz75OB4yyXpvtG1pCVb3zK/v nxs817va/HwDNcsapYnq2b9z89aAMXz1gSbLC1uX+Qx0onlrKtNntYc9nelmLeFZCzCA Wmm6PlZoHaPFzzvayEJfgrtS6y+Rn4FYwNAdxzCBNPLnIzyd+51latHQBPcqyz92dUTZ KCiUhgjp7GQ41UoWDFs5iZTmavzmNr1ZfvhDl0/NXJlPurvScC/t65FGg0shHItS5uVr E/NiHdhOOL/9RxhWVwN0zGxZydQA1k4c0kejsOChPnR1n0icEXsAhiVOSVug7XIexZY6 EL+Q== 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=jZbhKXF2K9UWgdUAfPksCUR+9PeJ8LRUYBa5SdhmbKM=; b=klyiGy6BxakErAP2IlTP0doWmOf3tjPGNr9hVrlHbcnJ5Hq1c0lhXgZwOgEaw5DcP4 aa+2PjcWv3qNKlgoN3wxd8peaajBSe5rxxy2PSdJW24FMO6KezwzfZDKck2EfIQZhC85 WMc+PI+8HUl3z+raGC7K+DobcUo9pIZ+ScNRsCsWWZxD+n3l+GONUtAexrNBPH3+Qycj NwIKZy/2gaF62gnNROU47F6hZkhTXjPdpVwMa3J1OdFlD3stmXgyAXmwIrfkfd9cMoPh InYTaYNskh3HDsWslHYXB8mVmWb8dELgTRlO9946re8kF8a7uq2QeHhDqacfBhScE9Qs dZNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QPorBkBz; 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 x73si9838411ywx.177.2019.04.02.21.01.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 02 Apr 2019 21:01:38 -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=QPorBkBz; 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]:55641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBX5m-0000rv-5m for patch@linaro.org; Wed, 03 Apr 2019 00:01:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBWpY-0003Fp-EA for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBWpX-0000Qa-5j for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:52 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:38336) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hBWpW-0000Pc-Ru for qemu-devel@nongnu.org; Tue, 02 Apr 2019 23:44:51 -0400 Received: by mail-pl1-x643.google.com with SMTP id g37so7314978plb.5 for ; Tue, 02 Apr 2019 20:44:50 -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=jZbhKXF2K9UWgdUAfPksCUR+9PeJ8LRUYBa5SdhmbKM=; b=QPorBkBzHz3p+wTcfg68whDENocovgCVMjOsqlSfrO2j356WUcbciIyO0nuH22NvJf 0cN2AVN6N2Wnu6w+KFMSwqOund99FHVF5dSpBfGGi9j8urmiurfABpcxI/ajGCGJNkv1 moNlqixys0AtnJnqUfow9nCUTt3zXhlp4PtI3evZMksVe4/ni1fOJC8NWPj+3G77zlyk y8mo6i6gjt9SDVE1Gvgv6h0d9LDOr+IOkWFj8F8/zUThd8rhAkcnpvdFbXD7+D+Gvs4e gL9CIASF6la2Fq7U09yPmsq5ru5KDELBwihWdcVbVTPdYyyD+ca2DxKQDYEfOCM1DBEy uoyw== 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=jZbhKXF2K9UWgdUAfPksCUR+9PeJ8LRUYBa5SdhmbKM=; b=n8yr2WWhvgkI/p/gWNXXr89kD2EtRrXHoVgOcYQ25m+OdCEamYNKZ8VrscyM9Mjmzm MG6/UXhq9kSJ9mUn691QbunDNmCuWkBeYmzz3bEolh8HIapfkG+i++Lt08HGiB6A8U9k kGPT11munuWYltc+f3J9V6/48wd2e351hEeFW3+iTqEPTBqu4RsBqDW5cUXV00Bb4Bap RG0GfCLbmJnznV44YgUF0SMONfM4Q/7vqK/QfghFmj4NAv8v6wOr4ksWxCUYwoITTS+a iai+MXzNQU/4bxTJFGyW5n6BzcGP+DQIDT4GjCdNi317nyjo8xjU4KDy8LLsIpyVnBfk s9GQ== X-Gm-Message-State: APjAAAUvq4XmfDG78ZKn2DiaztYMfnpgtFfXe+Et7/wCbyghoy7OJmNa iNT/33mEbouUE1EsnB7BV5Q3gpWWh3UwYw== X-Received: by 2002:a17:902:2bab:: with SMTP id l40mr74192882plb.273.1554263089663; Tue, 02 Apr 2019 20:44:49 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 20:44:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 3 Apr 2019 10:43:55 +0700 Message-Id: <20190403034358.21999-24-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::643 Subject: [Qemu-devel] [PATCH 23/26] target/xtensa: 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: Max Filippov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Max Filippov Signed-off-by: Richard Henderson --- target/xtensa/cpu.h | 5 +-- target/xtensa/cpu.c | 5 ++- target/xtensa/helper.c | 74 +++++++++++++++++++++--------------------- 3 files changed, 42 insertions(+), 42 deletions(-) -- 2.17.1 diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 4d8152682f..8ac6f8eeca 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -552,8 +552,9 @@ static inline XtensaCPU *xtensa_env_get_cpu(const CPUXtensaState *env) #define ENV_OFFSET offsetof(XtensaCPU, env) -int xtensa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int size, - int mmu_idx); +bool xtensa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); void xtensa_cpu_do_interrupt(CPUState *cpu); bool xtensa_cpu_exec_interrupt(CPUState *cpu, int interrupt_request); void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index a54dbe4260..da1236377e 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -181,9 +181,8 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_read_register = xtensa_cpu_gdb_read_register; cc->gdb_write_register = xtensa_cpu_gdb_write_register; cc->gdb_stop_before_watchpoint = true; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = xtensa_cpu_handle_mmu_fault; -#else + cc->tlb_fill = xtensa_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->do_unaligned_access = xtensa_cpu_do_unaligned_access; cc->get_phys_page_debug = xtensa_cpu_get_phys_page_debug; cc->do_transaction_failed = xtensa_cpu_do_transaction_failed; diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index f4867a9b56..3dcab54fbf 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -237,24 +237,49 @@ void xtensa_cpu_list(FILE *f, fprintf_function cpu_fprintf) } } -#ifdef CONFIG_USER_ONLY - -int xtensa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) +bool xtensa_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { XtensaCPU *cpu = XTENSA_CPU(cs); CPUXtensaState *env = &cpu->env; + target_ulong vaddr = address; + int ret; - qemu_log_mask(CPU_LOG_INT, - "%s: rw = %d, address = 0x%08" VADDR_PRIx ", size = %d\n", - __func__, rw, address, size); - env->sregs[EXCVADDR] = address; - env->sregs[EXCCAUSE] = rw ? STORE_PROHIBITED_CAUSE : LOAD_PROHIBITED_CAUSE; - cs->exception_index = EXC_USER; - return 1; +#ifdef CONFIG_USER_ONLY + ret = (access_type == MMU_DATA_STORE ? + STORE_PROHIBITED_CAUSE : LOAD_PROHIBITED_CAUSE); +#else + uint32_t paddr; + uint32_t page_size; + unsigned access; + + ret = xtensa_get_physical_addr(env, true, vaddr, access_type, mmu_idx, + &paddr, &page_size, &access); + + qemu_log_mask(CPU_LOG_MMU, "%s(%08x, %d, %d) -> %08x, ret = %d\n", + __func__, vaddr, access_type, mmu_idx, paddr, ret); + + if (ret == 0) { + tlb_set_page(cs, vaddr & TARGET_PAGE_MASK, paddr & TARGET_PAGE_MASK, + access, mmu_idx, page_size); + return true; + } + if (probe) { + return false; + } +#endif + + cpu_restore_state(cs, retaddr, true); + HELPER(exception_cause_vaddr)(env, env->pc, ret, vaddr); } -#else +#ifndef CONFIG_USER_ONLY +void tlb_fill(CPUState *cs, target_ulong vaddr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +{ + xtensa_cpu_tlb_fill(cs, vaddr, size, access_type, mmu_idx, false, retaddr); +} void xtensa_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, @@ -272,31 +297,6 @@ void xtensa_cpu_do_unaligned_access(CPUState *cs, } } -void tlb_fill(CPUState *cs, target_ulong vaddr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) -{ - XtensaCPU *cpu = XTENSA_CPU(cs); - CPUXtensaState *env = &cpu->env; - uint32_t paddr; - uint32_t page_size; - unsigned access; - int ret = xtensa_get_physical_addr(env, true, vaddr, access_type, mmu_idx, - &paddr, &page_size, &access); - - qemu_log_mask(CPU_LOG_MMU, "%s(%08x, %d, %d) -> %08x, ret = %d\n", - __func__, vaddr, access_type, mmu_idx, paddr, ret); - - if (ret == 0) { - tlb_set_page(cs, - vaddr & TARGET_PAGE_MASK, - paddr & TARGET_PAGE_MASK, - access, mmu_idx, page_size); - } else { - cpu_restore_state(cs, retaddr, true); - HELPER(exception_cause_vaddr)(env, env->pc, ret, vaddr); - } -} - void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type, int mmu_idx, MemTxAttrs attrs,