From patchwork Mon Jul 2 15:10:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140813 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp84350ljj; Mon, 2 Jul 2018 08:27:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfoBz7sFbksVDipakXa0lqRm0sNMvgyCH7CbzRWTznhrT4ehPkMSvGKp6iRLOBW8QCMY/v/ X-Received: by 2002:a37:97c4:: with SMTP id z187-v6mr22520369qkd.196.1530545277533; Mon, 02 Jul 2018 08:27:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530545277; cv=none; d=google.com; s=arc-20160816; b=sOF3o/O70ph+oICY7RUJY+ieprrGVJxjTKEnIo+Oru9GrvYWf+FcnldFWShkXo9tdU rh78cSpriCDJF4qW3f3mWXPfW0VpY+SWZwONPah1U+f9BJY9Lzo+0+BdSyGqE5XSE3Nu hD8DpBR13gpEFWGDRmMtc37mzp16WQigN9TVVo0s8EtYOKiRwYupCaEnq4FQG0hF65Pd evG5hcGxp81iCzMALkB49kIqHDp7Miv053Ke7gii/Jh1vU+oEybdbi3n89JwVRWzLJtA O0G1+ZF/oO8YttzEt8HaKCKGNIBlt2nlxv9RfVyJk81+USGMgLAecC9xXGI/f/lptxkr G90g== 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:arc-authentication-results; bh=NfAVGhkiKG5LOSRz+0cX59oYyiQyF8X1AP8p2lZ3qxA=; b=0a4NI6YFd60JoO7q2jlA5bwLbQ3MM2p+XU4FUxEJ3KS0i0846fyZe2eFQAt2YEDCRR D1OhecfuDAypMN0rZgj9wLGfBbOalwD/hljnB0DQGSpnY/e9bCGGK1z5VRd584wiACNo Dt4hms1LCI/pytvB9go8tVUmhzBtrgnayPtwFOaIX88W9gYN5/RxvBln9Rwi3/mkBh+d FhLrT2KfXhXpQgeIigaXztIbrgM2sI6bpRxwtLdXBu2oJWR9OLX8fvJrqlq/qyz6frK0 8KxVP1nmk8BJ6ikMJlLLLZm2TAHHIGeZ7GZAKotQpcSi+wsODbkOEjdssbHcsE5N3Crk 5aWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Uf2xHVj3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r37-v6si973570qvc.85.2018.07.02.08.27.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 08:27:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Uf2xHVj3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1]:33536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0k7-0000YZ-VX for patch@linaro.org; Mon, 02 Jul 2018 11:27:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa0UD-0004Sm-Fp for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fa0U8-0008Dw-Cu for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:29 -0400 Received: from mail-pl0-x22a.google.com ([2607:f8b0:400e:c01::22a]:34288) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fa0U8-0008DK-6r for qemu-devel@nongnu.org; Mon, 02 Jul 2018 11:11:24 -0400 Received: by mail-pl0-x22a.google.com with SMTP id z9-v6so8098975plo.1 for ; Mon, 02 Jul 2018 08:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NfAVGhkiKG5LOSRz+0cX59oYyiQyF8X1AP8p2lZ3qxA=; b=Uf2xHVj3MI6W5u/5O/QamrcdkdSwB05YQZad7+QkpegOi9xNcUptWcELDGWlxvR48B 7AAes/zbYlTlr+896FBSx4F8GJyVA7tDpDM80cHaI1+q8YCzA/Nm1tSRUC4N2TJHwxOz gFJwmHNvtuHF9zKeXV5yY8MJffx4OP5KdSn/Xd4GJ4DcV94yqDL9FRH+dwq7R23h0h9r RVn7VG8JExGxCmkYsM35wNix/bB4AGwoIzPUhcHcuPMp+wKQeGK6TDM+W72UgyVQQYJ/ s2xJgynb77b4DDdbLxd4Sj8HSMmL6Up9xBNWO5END9EdjRrAWvMSSAmS0ZfGorrhdczj u/iw== 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=NfAVGhkiKG5LOSRz+0cX59oYyiQyF8X1AP8p2lZ3qxA=; b=Op6lcViZXbIP4/pJxyaLHWcmgOYaPcIlFksulfjjr2bDzsqqSIhK3wvqRFMgs+Q6o6 Pz1FRPuafl2s/uVP6zTTD4VmFTCu4CBUaIdrVbzZ+rXKRM/ipDL5uNu+a3Ej8qc1tU/H VLPDql8akfQqU+gNZE7mi7BAOAATylP+sLUFU/WIuXKGQunoYYGKPZbz4vtWgOsDfOQ1 6Z98iTHU+p3RVQYzVf65tPZzEtA28lV0F4p59AzYniTzmRxZOEI8AhgdyiwHXdAzug02 E2nPgh547rOt7ZjMY5CZRX/tlyZieELTxnNvoGwURFsngz7A+C1jwTsgo+iEu2WFzov/ 39Jw== X-Gm-Message-State: APt69E2dwZfVJ8HnGv2YDN4ri8WNll28mRSVRaYJTnd0mK7rA9bED1aH yjDd03BSFscpMZBsjA1AvIchlRCh X-Received: by 2002:a17:902:6845:: with SMTP id f5-v6mr25982059pln.173.1530544283387; Mon, 02 Jul 2018 08:11:23 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id 125-v6sm8001766pgj.46.2018.07.02.08.11.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 08:11:22 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Tue, 3 Jul 2018 00:10:16 +0900 Message-Id: <20180702151023.24532-19-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702151023.24532-1-shorne@gmail.com> References: <20180702151023.24532-1-shorne@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22a Subject: [Qemu-devel] [PULL v2 18/25] target/openrisc: Stub out handle_mmu_fault for softmmu 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 , Richard Henderson , QEMU Development Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This hook is only used by CONFIG_USER_ONLY. Signed-off-by: Richard Henderson Signed-off-by: Stafford Horne --- target/openrisc/mmu.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) -- 2.17.0 diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index a4613e9ae4..f4c0a3e217 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -177,42 +177,17 @@ static void cpu_openrisc_raise_mmu_exception(OpenRISCCPU *cpu, cpu->env.lock_addr = -1; } -#ifndef CONFIG_USER_ONLY int openrisc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mmu_idx) { +#ifdef CONFIG_USER_ONLY OpenRISCCPU *cpu = OPENRISC_CPU(cs); - int ret = 0; - hwaddr physical = 0; - int prot = 0; - - ret = get_phys_addr(cpu, &physical, &prot, address, rw); - - if (ret == TLBRET_MATCH) { - tlb_set_page(cs, address & TARGET_PAGE_MASK, - physical & TARGET_PAGE_MASK, prot, - mmu_idx, TARGET_PAGE_SIZE); - ret = 0; - } else if (ret < 0) { - cpu_openrisc_raise_mmu_exception(cpu, address, rw, ret); - ret = 1; - } - - return ret; -} + cpu_openrisc_raise_mmu_exception(cpu, address, rw, 0); + return 1; #else -int openrisc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, - int rw, int mmu_idx) -{ - OpenRISCCPU *cpu = OPENRISC_CPU(cs); - int ret = 0; - - cpu_openrisc_raise_mmu_exception(cpu, address, rw, ret); - ret = 1; - - return ret; -} + g_assert_not_reached(); #endif +} #ifndef CONFIG_USER_ONLY hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)