From patchwork Thu Jun 28 03:03:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 140404 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1653831ljj; Wed, 27 Jun 2018 20:18:45 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcXlWSoiF/w0PhAkj1jj88Eq5U3kLmt3d1x0dPJvlD9xo1BaGsfcsDSGdeNG0vmqVWds2qw X-Received: by 2002:ae9:c002:: with SMTP id u2-v6mr3391386qkk.391.1530155925428; Wed, 27 Jun 2018 20:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530155925; cv=none; d=google.com; s=arc-20160816; b=EoyhIEIxqbH9KtUdEUbxVlZr0ojnfVY62MOrDqepiUUMJBmPxPWaDVcZ+9GuCTtjNJ r7TWequZ7jLOUu5tvK5grTdOFgNYuWgN9DoTHYT7S7UsbyPZx9QEgdD6gnlsLZVspPYU HurM7rbZ2QY6kWQzQJvDUT2o9cDeHjKSYXtHZX5/4VSE5KjNl2tP4MFtiiRaTJuJjifZ PyjFkKNqA2O/beZUzzaTpzbwIcrcCBA/RzPBmSaP1t4RUJG7u1pezoqf/+lD02ykAT5Y tczTiZMmw3+XqkVVeZmY+acu85CVTJ36Eoeuh9bIdckC7L4oLOQXu/ktt6eGfJ3PY9mU 3lew== 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=xQ7MuAb0CMxAlY812ETLA9j5/iyPIirofg3K3ekSZ3o=; b=gQyD8KmBA1mHdXdc6e+ojuS5huXfkdqpkhi1xPERWatuHTd550zsH32pvttG1JZH1O IIW+1kR9gGPuECqS7GAwf9iypLe4y1s9AAyxafjn/MF8PuEsXTSK1hknLk80KdhV57Wq ID1YVXd60u6aF0o30hKg4i2+chnbABRzrur7eFr/ENutVdTuI5zGDX/1yvadkp7q2Fcw R29CXYff0KyhgrA0wiFtmDNvpb9Rxtl8rHi78W1u3+3GbCwzCKAGEr0b5UQ6r7JsA9AJ Dhil33E6vcfsuu0740Vm3OKLFITJF4kFeJWTLUHjwuZgwtWUdJTHySR5mYl6DBCIDne/ Gq+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RUPwBz+W; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j7-v6si741688qkc.31.2018.06.27.20.18.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Jun 2018 20:18:45 -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=@linaro.org header.s=google header.b=RUPwBz+W; 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=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYNSG-0000SI-S6 for patch@linaro.org; Wed, 27 Jun 2018 23:18:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYNDz-00058O-Sk for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:04:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYNDz-00089S-1n for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:59 -0400 Received: from mail-pl0-x230.google.com ([2607:f8b0:400e:c01::230]:34755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYNDy-000886-R6 for qemu-devel@nongnu.org; Wed, 27 Jun 2018 23:03:58 -0400 Received: by mail-pl0-x230.google.com with SMTP id z9-v6so2018569plo.1 for ; Wed, 27 Jun 2018 20:03:58 -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=xQ7MuAb0CMxAlY812ETLA9j5/iyPIirofg3K3ekSZ3o=; b=RUPwBz+WpLzm7fsA7unl8mobGoY0aFx2L0aaVdvwxXZ+Zt+Icl2ZVjz62Sgc+3/Try r75qsVCryMgQfndotVMqflAYsd3I1xnAgmD9xC3m6Iu8X6wuTb5ay9ZceTkZbpmWDxyx K0x0CT87m8eWWd1+8KPMFvRWAUBkuwC7BkNHc= 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=xQ7MuAb0CMxAlY812ETLA9j5/iyPIirofg3K3ekSZ3o=; b=TtkRP1TukzLqkeYrudD6g5P1Oc3qHg7r8B9MXbKYtjvSekI28Rlb0k6DxSREHodUer iYeXNQBBe3U3k+kOdN6qxJiuirAO+grg+lxqpIdOxGFNQ7AvbfIfxcqwd0hD/qcMfg/J vHIq7/sNuPxCkfdxj8InO/sH7LXaVv0iAvY9w3P+iQr/XeIUJQTfVtOxN74mYynPPxgE g6FHGNvi6muMVsZWyUEbWES+go7j2b/u3xxBkrTqeff1pZxPBO+9YwMktRJpBWCdcDNe xtvjV5uxMRNyZ9IZaAi/LnGhYicQKMkTv5EYJ+3LxDnAzfm1W5irfb6qvpPIXLnEjp5c mqTQ== X-Gm-Message-State: APt69E34AzaRapFHZHZzMlXExCc3UVCLDdyIP0mfMYclWAzMO59cXy6z 1rgIB3OWQVZuKM7IeFRJLfrfa4VXzL0= X-Received: by 2002:a17:902:ba87:: with SMTP id k7-v6mr8605435pls.271.1530155037652; Wed, 27 Jun 2018 20:03:57 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-112-211.tukw.qwest.net. [97.126.112.211]) by smtp.gmail.com with ESMTPSA id y15-v6sm8030489pfm.136.2018.06.27.20.03.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jun 2018 20:03:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 27 Jun 2018 20:03:25 -0700 Message-Id: <20180628030330.15615-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180628030330.15615-1-richard.henderson@linaro.org> References: <20180628030330.15615-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::230 Subject: [Qemu-devel] [PATCH v3 18/23] 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: shorne@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This hook is only used by CONFIG_USER_ONLY. Signed-off-by: Richard Henderson --- target/openrisc/mmu.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) -- 2.17.1 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)