From patchwork Mon Jul 2 13:57:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 140769 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp10843ljj; Mon, 2 Jul 2018 07:19:16 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdmVd3qYqPRXWUTQncr/nQtzn1TvO7CpqYELjwZSU97ZkkgIK6aqKgGOTXEu13oPmKYfK5v X-Received: by 2002:a37:188c:: with SMTP id 12-v6mr22485299qky.72.1530541156146; Mon, 02 Jul 2018 07:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530541156; cv=none; d=google.com; s=arc-20160816; b=fJOvqPuWNTRF+93tI3uuwO2GSLAOOxRPwRMpluWsztJLYzMrtmN8SZj3x/jCVATWQW LN87edKoD81pDr/csyfnu2TjO/XvkbNPSJJTmmkA4B/v+sd5X5rS+HsWxtJxxessrhAU vks2/7GrBX6fq4PVki8KbDGb0GQEh59YOXQZ6fFzM+4RMZkrUHMaGDc2EgOkbGruJETV VV8yeBNkVn96a0t/QznR8W68t/O8rv/Bvvg8knX9XjsTv1hjqu4NbHsl1mhKSZCoBy7G P9YdTJlbQq4GZmf5n2hyP3o9oyNAJCIBFYltUN/ZQbNBfCqcDP6zfDjnMNnEmfptOHUz G3rQ== 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=X8+dsFRQh/FiGA4XqVTRhhPwoM/aJNCigDVrmgLLdk7bcgEGuWUZUqvcL179myPvaS wMkwC0PfBpyuVebGMEM+WksidYqQ66qndI4V7yR8S4PsoBC1wLfH0vt4sYb98Lvsp/8K Ng2MBhynfYA9DRgYmXd2BEBYotOpbSkwL9yBl63tYgYY1BYvUrOf6SqYnz3YoRSi+hbh 8sQHo52Q8YdVnGvpOV8QxupkO08N++2vXPS+KvebCyRvo9v6c8aU2kAKpANYJ7Y/uGZv ZWQPJNj4jTMURxCRh75XfQ5WpJXqwFsm+F8MGGLEwZEZnIy9Hmy55+T4bY6lcaX3tX5r nbHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=paAbMTm6; 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 y36-v6si4165712qtd.59.2018.07.02.07.19.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:19:16 -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=paAbMTm6; 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]:33062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzff-0008SU-Ij for patch@linaro.org; Mon, 02 Jul 2018 10:19:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzM3-0002iC-Jq for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzM2-0008M2-Og for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:59 -0400 Received: from mail-pl0-x231.google.com ([2607:f8b0:400e:c01::231]:35356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzM2-0008La-Ij for qemu-devel@nongnu.org; Mon, 02 Jul 2018 09:58:58 -0400 Received: by mail-pl0-x231.google.com with SMTP id k1-v6so8010346plt.2 for ; Mon, 02 Jul 2018 06:58:58 -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=paAbMTm6H3dUqLbEBiqxCFpz08GLb5Eb1EaxTSmYGXUeVPmSyKuBveNf8ELsaEE19o X/1ekOcWiAmjYstU2fjnw5Rz6KKx9A3JfRokNiIkGs53id0zd/lorVVMWN77Sw8fARhs kIdl8nzmB32v2VI4CPnfCvkxx8KUbgyFtWJ/173ZWRgsvYYb1nYe9DjxCkfroW3c0Vej UAchjFTN4rIK/eceuZwOCeEt/caetyTzP5ONY7GZUUtJ8GDxBunMtSx84jVPRtV9+fAp t1fzVOznOKNCBnay9xsmqfL0WZVWMF6hPRN010zMdmcLIzOetaD1oN2KC3sUDllYx/7+ PXNg== 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=WN4+AoZtbSWfRUlGX5r7ukqmNxe2KOZLQhbPFTOWpg1uvizJtYitrehiF1MkG3NWwo XS5IXdlyDd4Oorw7W7cFtQFXs675saLJaxRU3MdGff65P2BeLTqxgkCXzK1mUKfeUHou VwIqTlvQaEysAQboUJHrHygDzU3/JkpnK4Y+05oKvL8aLjDGujZUs88Vm2Nb849Q5d/4 cggyuuoAANISgcFIDqGJSriaEvzrmQmeMzVxPhqsGSNsy3dqh9JLLzN8bKJIcXbokIPJ 75u6Djw3dw3XFJlmc4Kge6KWcCkk1VHe92cDw4yBr5V8j2jaQq/QPoJ/MUHizDXwjPZ2 vwGg== X-Gm-Message-State: APt69E0XYs+Jf7vuhoT4YTPBZQRxpRW3Yf+Hpdf4Jlu8CwHwWc7m/CgO DhmShrdva+Ek4M/5H/ImiqA= X-Received: by 2002:a17:902:6802:: with SMTP id h2-v6mr25651944plk.113.1530539937595; Mon, 02 Jul 2018 06:58:57 -0700 (PDT) Received: from localhost (g90.124-44-6.ppp.wakwak.ne.jp. [124.44.6.90]) by smtp.gmail.com with ESMTPSA id z123-v6sm24493773pfz.16.2018.07.02.06.58.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 06:58:57 -0700 (PDT) From: Stafford Horne To: Peter Maydell Date: Mon, 2 Jul 2018 22:57:59 +0900 Message-Id: <20180702135806.7087-19-shorne@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180702135806.7087-1-shorne@gmail.com> References: <20180702135806.7087-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::231 Subject: [Qemu-devel] [PULL 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)