From patchwork Mon Jun 15 17:24:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 49903 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9DC3F211FD for ; Mon, 15 Jun 2015 17:32:36 +0000 (UTC) Received: by wifx6 with SMTP id x6sf23010082wif.1 for ; Mon, 15 Jun 2015 10:32:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=MjMXDwzkzaxOzg8KguN7mH4kuIxnKuBT/XX2H/u7WAA=; b=RvXUnLp65GRhW9HnqJjcAJ1OwWDhyxBB82lPRMyE8h6L+GW1yCA1PkJfpMU5WAjqKN ES+cMFdo+67+s9kZts3FA72sxUHjpddip6RdDixZL2mxyhyVSKclIlhF9GyeKNMC1lLQ vPnAnTBVXOEl9xv5M5itPni+j41n1PMCh7UfUPr+kMxcZ+qW8f/ss1DmSsZD/ZFW4eAx 4f+L2ArwQp7a7V6Mk0vdf7oGoHQMnDs9xnxsnkiFR6EgJvWG5FfANFlsbuATEWn6sckl VhPtQ7roqTljFULuImKctUoz71EBofsVnBNg5OWPe4M7gMIEnPI+a5QLH71htFr3sfaP 9Paw== X-Gm-Message-State: ALoCoQkxYE7JuXDb2v9NDiWYTefByqrtFu2eM8emLC3H42SrfjyNQyybyy/ied+ABEziGz2L8xHc X-Received: by 10.112.159.41 with SMTP id wz9mr1078103lbb.17.1434389555959; Mon, 15 Jun 2015 10:32:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.105 with SMTP id x9ls933154laj.11.gmail; Mon, 15 Jun 2015 10:32:35 -0700 (PDT) X-Received: by 10.152.6.39 with SMTP id x7mr27985138lax.18.1434389555631; Mon, 15 Jun 2015 10:32:35 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id b8si1643468lbg.101.2015.06.15.10.32.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jun 2015 10:32:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lblr1 with SMTP id r1so31571178lbl.0 for ; Mon, 15 Jun 2015 10:32:35 -0700 (PDT) X-Received: by 10.152.21.136 with SMTP id v8mr28241746lae.19.1434389555496; Mon, 15 Jun 2015 10:32:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1566433lbb; Mon, 15 Jun 2015 10:32:34 -0700 (PDT) X-Received: by 10.140.92.41 with SMTP id a38mr36886428qge.30.1434389554102; Mon, 15 Jun 2015 10:32:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z76si7831409qkg.52.2015.06.15.10.32.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 15 Jun 2015 10:32:34 -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; Received: from localhost ([::1]:35659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4YFN-0003Ew-97 for patch@linaro.org; Mon, 15 Jun 2015 13:32:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8D-0007Xo-F7 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4Y8B-0001QC-NL for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:09 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Y8B-0001AA-F8 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 13:25:07 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Z4Y83-0003XC-N7 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:24:59 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 15 Jun 2015 18:24:54 +0100 Message-Id: <1434389098-13430-25-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> References: <1434389098-13430-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 24/28] arm: helper: rename get_phys_addr_mpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Crosthwaite This get_phys_addr is really for pmsav5. Rename it accordingly. Reviewed-by: Peter Maydell Signed-off-by: Peter Crosthwaite Message-id: bf4b019aa87d682a45998105ef8e4d4e97a5e117.1434066412.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell --- target-arm/helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index f038a03a..00509b1 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5759,9 +5759,9 @@ do_fault: return true; } -static bool get_phys_addr_mpu(CPUARMState *env, uint32_t address, - int access_type, ARMMMUIdx mmu_idx, - hwaddr *phys_ptr, int *prot, uint32_t *fsr) +static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address, + int access_type, ARMMMUIdx mmu_idx, + hwaddr *phys_ptr, int *prot, uint32_t *fsr) { int n; uint32_t mask; @@ -5902,8 +5902,8 @@ static inline bool get_phys_addr(CPUARMState *env, target_ulong address, if (arm_feature(env, ARM_FEATURE_MPU)) { *page_size = TARGET_PAGE_SIZE; - return get_phys_addr_mpu(env, address, access_type, mmu_idx, phys_ptr, - prot, fsr); + return get_phys_addr_pmsav5(env, address, access_type, mmu_idx, + phys_ptr, prot, fsr); } if (regime_using_lpae_format(env, mmu_idx)) {