From patchwork Fri May 10 15:19:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163874 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2521275ilr; Fri, 10 May 2019 08:28:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxAJ+C+dh9xs/pgHDt8knk8BU8eRvonKPPXvk3lh/MwtzbPkHNwDpQDaV+pS8VktF0/33tv X-Received: by 2002:a05:6402:1214:: with SMTP id c20mr11521681edw.38.1557502126233; Fri, 10 May 2019 08:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557502126; cv=none; d=google.com; s=arc-20160816; b=wEIaPBjwBHBmZEOAGf1MByJ0JFzAZYSiJTJ/BxPw5HjimHDRxBY0Bq/aY7RB95Tz4X 2eSKa6MHd+hK5n2xYT24RWI4KSKonPdjApP5l95yH5ohfowY2iKFTAIZAaWEZ4xL1YFt GYt3EJb0nk7UuAW43Sjaqf1U57zKmwmfGi/nmULt1OpqCTNvMssnPCzjhKNhdh1tHr9q dheaQJohumKD1118kC19pNL8rvBS6GhLVz5b9ZrdBNsOyWKKoTPX4SjhQzW0yOujbeV7 St7hhcuaPskZa9JMcHwIpQ4u7LhvT+WWYjOidfDMdME/abqEe6nqmpSG9hmmQWXDdwVk Yk+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=ERTfGga5mStSjhtEmfd35eidZa/k5s6k3BsixP9VyyI=; b=pwOyB3xNy0K+RQwxcX0+zMuOv8+Bu0+rpYBV3gySU0A7VjukaTnhLXYBDL2d1X4zCS +4qfbQ6pafMYMkAtXxMPJ0IQqYHuQbMRrUUa68//kE5aiwdX2HSoM1QxMu5oazvsGBLV S2y20KZ62wiiWqk5eksfqIW0Iz16iZb/wQpJ0T4M3kvocwj8jrOO8Tc/hcCceW2LnKbS 9Ep5MM1nzMXxvSUEkm8ocAQkWfDyB+9H7Y1wu1+ReF5rBD7ZQZ5TbMnYZZBxljiOz2WH +GW9HpYUEp7iX6Sf24jb+ToevjZ9TfnL6alZvRzxYRPW7qpRPE0n8ydpxqsI1Hdv4izQ +Rxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TFUFnw6H; 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 g15si3167493ejh.173.2019.05.10.08.28.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 08:28:46 -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=TFUFnw6H; 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]:45095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP7S1-0007LQ-2Y for patch@linaro.org; Fri, 10 May 2019 11:28:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP7Jh-0007fV-FJ for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP7Jg-00005x-6P for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:09 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:37934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP7Jg-00005J-0y for qemu-devel@nongnu.org; Fri, 10 May 2019 11:20:08 -0400 Received: by mail-pl1-x641.google.com with SMTP id a59so2995912pla.5 for ; Fri, 10 May 2019 08:20:07 -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=ERTfGga5mStSjhtEmfd35eidZa/k5s6k3BsixP9VyyI=; b=TFUFnw6HA8dXeMZZN6tkZPD/k5JYIs2K/wQ5rMZhUbayZKyxF8+5x/ag4qhFBNWou2 VbKLZvDKTTEw/DHL0kWj1G4+WaH5FBEwSwHiNeZHu0dME2cGSPA73+jBv60gh9HCs/XE lKc1tygl/bHWS/GcCZdCcyduSV6PwV82GUmMtrUiQN86/vSnxl9EIJBO7KLFFezU4FWj 8jF0JhLzUPIngMRJRibwCDker8j1Mwj7xCWSiYOo44bUIZhhzcqalp0bhPUHpkoU8UVj A+eKXo9GHtkGctvbGLMGFcwpMKOV0EwVKoQydtFoi/l8Pp0fO1Wt5KyEv51qcvv1LOzg HtCw== 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=ERTfGga5mStSjhtEmfd35eidZa/k5s6k3BsixP9VyyI=; b=rUZJ1jGjpTGf727ccV18egZwyMjfk72VX+un9R6EfpiyVy6E8dRQoZbrS4gNs7ZKtN S5VcPt5lnevYq3XbR4cbHVglg+e4+RrlY0funiOyB0oHuDkog1dDFSNHF11KmPUfVcR6 wwpO5Q3HjbrzGRlTSB739eXchHtbf+pkpGr+wvuXJ6kcd+G8d7cl/CErf3EKhLRAbQVx b+kG44mXlXmWs/8kj/Nb5mql/BuZWO3rXZtMFqzybe/LtcyuqxZa80pQ/pmg1JagZrMj ckuTUPcN3NOZmL9c/EuL5PXMGRCNn+Crln9pTX0oS1bznrxRLLm/aYd2Ty/FJevAFL1f QOwQ== X-Gm-Message-State: APjAAAWh6NCQ1wXggYtNmV/SoqVclwaPoi1UKUR//LQh8zqJPEUhym2d 6Y9AasPDamARGfdg8Pqvc9gB7aYNdtA= X-Received: by 2002:a17:902:4281:: with SMTP id h1mr2833560pld.288.1557501606712; Fri, 10 May 2019 08:20:06 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id 19sm5920517pgz.24.2019.05.10.08.20.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 08:20:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 08:19:33 -0700 Message-Id: <20190510151944.22981-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510151944.22981-1-richard.henderson@linaro.org> References: <20190510151944.22981-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::641 Subject: [Qemu-devel] [PULL 16/27] target/ppc: 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: peter.maydell@linaro.org, qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: qemu-ppc@nongnu.org Acked-by: David Gibson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/ppc/cpu.h | 7 +++---- target/ppc/mmu_helper.c | 22 +++++++++++++--------- target/ppc/translate_init.inc.c | 5 ++--- target/ppc/user_only_helper.c | 14 ++++++++------ 4 files changed, 26 insertions(+), 22 deletions(-) -- 2.17.1 diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 5e7cf54b2f..d7f23ad5e0 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1311,10 +1311,9 @@ void ppc_translate_init(void); * is returned if the signal was handled by the virtual CPU. */ int cpu_ppc_signal_handler(int host_signum, void *pinfo, void *puc); -#if defined(CONFIG_USER_ONLY) -int ppc_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, - int mmu_idx); -#endif +bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); #if !defined(CONFIG_USER_ONLY) void ppc_store_sdr1(CPUPPCState *env, target_ulong value); diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 1dbc9acb75..afcca50530 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -3057,15 +3057,9 @@ void helper_check_tlb_flush_global(CPUPPCState *env) /*****************************************************************************/ -/* - * 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) - * - * XXX: fix it to restore all registers - */ -void tlb_fill(CPUState *cs, target_ulong addr, int size, - MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +bool ppc_cpu_tlb_fill(CPUState *cs, vaddr addr, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { PowerPCCPU *cpu = POWERPC_CPU(cs); PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs); @@ -3078,7 +3072,17 @@ void tlb_fill(CPUState *cs, target_ulong addr, int size, ret = cpu_ppc_handle_mmu_fault(env, addr, access_type, mmu_idx); } if (unlikely(ret != 0)) { + if (probe) { + return false; + } raise_exception_err_ra(env, cs->exception_index, env->error_code, retaddr); } + return true; +} + +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +{ + ppc_cpu_tlb_fill(cs, addr, size, access_type, mmu_idx, false, retaddr); } diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 0394a9ddad..3f847de36c 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -10592,9 +10592,8 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_read_register = ppc_cpu_gdb_read_register; cc->gdb_write_register = ppc_cpu_gdb_write_register; cc->do_unaligned_access = ppc_cpu_do_unaligned_access; -#ifdef CONFIG_USER_ONLY - cc->handle_mmu_fault = ppc_cpu_handle_mmu_fault; -#else + cc->tlb_fill = ppc_cpu_tlb_fill; +#ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = ppc_cpu_get_phys_page_debug; cc->vmsd = &vmstate_ppc_cpu; #endif diff --git a/target/ppc/user_only_helper.c b/target/ppc/user_only_helper.c index 2f1477f102..683c03390d 100644 --- a/target/ppc/user_only_helper.c +++ b/target/ppc/user_only_helper.c @@ -20,21 +20,24 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/exec-all.h" -int ppc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, - int mmu_idx) + +bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr) { PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; int exception, error_code; - if (rw == 2) { + if (access_type == MMU_INST_FETCH) { exception = POWERPC_EXCP_ISI; error_code = 0x40000000; } else { exception = POWERPC_EXCP_DSI; error_code = 0x40000000; - if (rw) { + if (access_type == MMU_DATA_STORE) { error_code |= 0x02000000; } env->spr[SPR_DAR] = address; @@ -42,6 +45,5 @@ int ppc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, } cs->exception_index = exception; env->error_code = error_code; - - return 1; + cpu_loop_exit_restore(cs, retaddr); }