From patchwork Fri Dec 7 10:36:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153131 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp349016ljp; Fri, 7 Dec 2018 02:55:35 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uy/y6c36VW/FTtDfRzyJZDQKkG26xWhPXMoKtR+/OO/2mXIwHhllS7L25vOddfRIXBU0n9 X-Received: by 2002:a37:d4d9:: with SMTP id s86mr1335126qks.190.1544180135809; Fri, 07 Dec 2018 02:55:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544180135; cv=none; d=google.com; s=arc-20160816; b=S+lJ/VbG7uWKmeHGrpQasmKUZhIzK5f3c/VU9sg1kaS2jMBKDHzUHKBCg2WFesz4z5 DK9QPsIA8mteXklWadue6HmYGmrcj72OAfw62m0HAxBF9X0BIQ8ThJTJrClXcXyUUx5h wOGUcPFRHHXDIXYaoskJvoJL/uMgLMlzrBlnT6jOZTbzUCPxeVmekNmEWal9wi0GGUB1 xpQpWXgI5VFXSo38InbixTYa1c6nAoAEVCYYPaSeP2/8lIpi2ZFL289pSp0hq+1e9OZ0 FMqgperUwUFf/z6nytZkWt1LxaeU9+Q0VhXxcT2SuVn4m+xic3/x99cRbYnnXzCw5J76 Yo2w== 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=offWiYQFX6nV0RjdB1cFsP2+NJhS8A/OLt/978IHcjg=; b=GnAqxUMRTgr+k+DFL7rmp8ldr5KBc3gv1v8I9Sjexr+y6/BTL4yB4ZGpiG+S2nM2v6 dNXb8kbvA1Eg25YsENKJO/VlyRf2eywxpLhsXu9k6C9y5Z76QF7OeepRwSRRghKq5cSv AJ0QW7G0VvSrhCeOS+kxfFwOpHQ/hLW3ofm0FpBgzsbNAJcheoN0Sld5UDrEz6+HqVeK LlaITrcdcXvFWEjffNPm+w9Ze9dINBljzpdDTIbJt1nfHafXFpsV3pw/upOUCFyqr6r0 1p5Suf+OLzBxDYWhmIrVz5IYsTVJDusbq6D8FtHjLB4PG8UcUO79wPo/TorPwB27fNo2 T4gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jdTuc7UT; 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 b2si362227qtc.147.2018.12.07.02.55.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Dec 2018 02:55:35 -0800 (PST) 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=jdTuc7UT; 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]:45349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVDnD-0004C1-8W for patch@linaro.org; Fri, 07 Dec 2018 05:55:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVDVJ-0008HH-Ak for qemu-devel@nongnu.org; Fri, 07 Dec 2018 05:37:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVDVH-0007tA-MT for qemu-devel@nongnu.org; Fri, 07 Dec 2018 05:37:05 -0500 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:38516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gVDVH-0007t2-Gl for qemu-devel@nongnu.org; Fri, 07 Dec 2018 05:37:03 -0500 Received: by mail-oi1-x243.google.com with SMTP id a77so3000547oii.5 for ; Fri, 07 Dec 2018 02:37:03 -0800 (PST) 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=offWiYQFX6nV0RjdB1cFsP2+NJhS8A/OLt/978IHcjg=; b=jdTuc7UTLxakTXJoDEcLuj92E6HS4WIqNWatLV19tr8AojY6hmvxZRiGCxk4Vc0+dT /W4PfTm78t1ky6eKraYBXyXDL9IqYw2edaB5/IVPZL3peKD4xWMCEkraxKDMpYIBJ9U9 PfKmyPAAeSlafuCUSJ9zuEcD4RQA9HVkd/Gr0= 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=offWiYQFX6nV0RjdB1cFsP2+NJhS8A/OLt/978IHcjg=; b=oDS3KEoIBAo88TPfX59wV5jflKQKPATkwa1VEELmWZFoRlkW53cNKu2SFBlhq/t+zX 9CF5MAqm2nb5Ho3ZYGUuAVM/Ea9rqk9AB3dZWVzWQADCCFReT6qaK+drmCd+GSx8Vaxo JRHKzL9R2BtILSzvParf1/BVZuBrDdn8FZ2Osp4tvg1KXd8RnmwDCCisXTN8k+WIS1AI qwZ0ZOVmWjI3OyQ12jyBAfJMp4xY1ExVG/xoWaDdvPM328wHNKTCHSTR/WrTZgVRihzl DWJM9n85Mvn2sfcslqRqldxfACB+Qu7CSTfD2BYf79TcBUApKUsrgjrI/egsDuch2DeP g8xw== X-Gm-Message-State: AA+aEWZSGckHMS4sp94+2aV6D4KMm6vs1JiHMIQJaptqDXgly6dHHfmY JaagU5I9YcIeEIv2xnirXYefh+83iQA= X-Received: by 2002:aca:b58b:: with SMTP id e133mr958099oif.25.1544179022546; Fri, 07 Dec 2018 02:37:02 -0800 (PST) Received: from cloudburst.twiddle.net (172.189-204-159.bestel.com.mx. [189.204.159.172]) by smtp.gmail.com with ESMTPSA id c19sm2037594otl.16.2018.12.07.02.37.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Dec 2018 02:37:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2018 04:36:23 -0600 Message-Id: <20181207103631.28193-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181207103631.28193-1-richard.henderson@linaro.org> References: <20181207103631.28193-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::243 Subject: [Qemu-devel] [PATCH 18/26] target/arm: Export aa64_va_parameters to internals.h 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, ramana.radhakrishnan@arm.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We need to reuse this from helper-a64.c. Provide a stub definition for CONFIG_USER_ONLY. This matches the stub definitions that we removed for arm_regime_tbi{0,1} before. Signed-off-by: Richard Henderson --- target/arm/internals.h | 29 +++++++++++++++++++++++++++++ target/arm/helper.c | 16 ++-------------- 2 files changed, 31 insertions(+), 14 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/internals.h b/target/arm/internals.h index 6bc0daf560..4d25b267e8 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -912,4 +912,33 @@ void arm_cpu_update_virq(ARMCPU *cpu); */ void arm_cpu_update_vfiq(ARMCPU *cpu); +typedef struct ARMVAParameters { + unsigned tsz : 8; + unsigned select : 1; + bool tbi : 1; + bool epd : 1; + bool hpd : 1; + bool ha : 1; + bool hd : 1; + bool using16k : 1; + bool using64k : 1; +} ARMVAParameters; + +#ifdef CONFIG_USER_ONLY +static inline ARMVAParameters aa64_va_parameters(CPUARMState *env, + uint64_t va, + ARMMMUIdx mmu_idx, bool data) +{ + return (ARMVAParameters) { + /* 48-bit address space */ + .tsz = 16, + /* We can't handle tagged addresses properly in user-only mode */ + .tbi = false, + }; +} +#else +ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, + ARMMMUIdx mmu_idx, bool data); +#endif + #endif diff --git a/target/arm/helper.c b/target/arm/helper.c index 3ad5909b1e..c73525f813 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9712,20 +9712,8 @@ static uint8_t convert_stage2_attrs(CPUARMState *env, uint8_t s2attrs) return (hiattr << 6) | (hihint << 4) | (loattr << 2) | lohint; } -typedef struct ARMVAParameters { - unsigned tsz : 8; - unsigned select : 1; - bool tbi : 1; - bool epd : 1; - bool hpd : 1; - bool ha : 1; - bool hd : 1; - bool using16k : 1; - bool using64k : 1; -} ARMVAParameters; - -static ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, - ARMMMUIdx mmu_idx, bool data) +ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, + ARMMMUIdx mmu_idx, bool data) { uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; uint32_t el = regime_el(env, mmu_idx);