From nobody Tue Feb 10 09:59:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546987794880441.5814086870407; Tue, 8 Jan 2019 14:49:54 -0800 (PST) Received: from localhost ([127.0.0.1]:44185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gh0C1-00007N-Qt for importer@patchew.org; Tue, 08 Jan 2019 17:49:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggzvC-0000LZ-Fa for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggzvB-0004ue-OU for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:30 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:42419) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggzvB-0004ts-Iv for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:29 -0500 Received: by mail-pl1-x642.google.com with SMTP id y1so2559686plp.9 for ; Tue, 08 Jan 2019 14:32:29 -0800 (PST) Received: from cloudburst.lan (2001-44b8-2176-c800-8cc6-2630-7d99-5ef1.static.ipv6.internode.on.net. [2001:44b8:2176:c800:8cc6:2630:7d99:5ef1]) by smtp.gmail.com with ESMTPSA id w128sm100686177pfw.79.2019.01.08.14.32.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Jan 2019 14:32:27 -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=HtgD2kb0Tk4a5mvvgc/yTa4iLNXqbugMtAKVtQjNC/Y=; b=W/gcyjNTMpSJSCNGPMjfy1gRASXkpVNNpsxZ91KQPRAiPcD3xEe6H1TeFva2V8/vR/ JopoWG1vqgLRzHW25ik/F+5L5jpPC5REHThunmYbZ0t2wHX8PSC2ak0w5SHGatam25be PkJsaLvoH+RhOkZDv247k44IRpjro5CxZvQ9k= 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=HtgD2kb0Tk4a5mvvgc/yTa4iLNXqbugMtAKVtQjNC/Y=; b=dO/VOUZBswzmP/bhJc25LCrXTW7rnkDtCR+Ypbn2MawdG+BbmuIV8mFhVh2y36UkV4 eT8cNo9zTYE49JGp4a7+zUeyKtQkyrMW0xi8wWoMo5hqVvPJgbI+OOfwIPKk1dt75Irt 02xy/5Y/FhJ23MiMFcID9iGwRLtY8EpSyQ1B/pFG+EZb/G+aN4kBmVSh3oTPRLfJaUaj 4/W0PxhaHMjoFoo180k/4AbeEOBxH4P9WhGgfcd4t16Ut9nQrngz8/mujCmMCvO9pESj yFz+KMz/KFhjo7YSax3TqUIjSL4+pEtZ7vif32IX+KdVnK4h7qWdDlP+7D9mKfo7AxAH ES5A== X-Gm-Message-State: AJcUukew5EIjOLfvnzmT2R4k0URhwAyTfWfB/LAcqnZPiro3NRUrayEe /+Pgz1aNYgN7mlj89hmd+IzjkkaOrPU= X-Google-Smtp-Source: ALg8bN4JuscTo8xoq8MfRB6ZFP3udIoXC3+civN+ApZlOQrOCYwImNchQZPE1HZEs9EjzEWblH8jFA== X-Received: by 2002:a17:902:9a81:: with SMTP id w1mr3434700plp.19.1546986748327; Tue, 08 Jan 2019 14:32:28 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 08:31:18 +1000 Message-Id: <20190108223129.5570-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190108223129.5570-1-richard.henderson@linaro.org> References: <20190108223129.5570-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::642 Subject: [Qemu-devel] [PATCH v3 20/31] 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/internals.h | 17 +++++++++++++++++ target/arm/helper.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index fdda2c866a..82cf685695 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -956,4 +956,21 @@ typedef struct ARMVAParameters { bool using64k : 1; } ARMVAParameters; =20 +#ifdef CONFIG_USER_ONLY +static inline ARMVAParameters aa64_va_parameters(CPUARMState *env, + uint64_t va, + ARMMMUIdx mmu_idx, bool d= ata) +{ + return (ARMVAParameters) { + /* 48-bit address space */ + .tsz =3D 16, + /* We can't handle tagged addresses properly in user-only mode */ + .tbi =3D 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 f934c80c28..f4538c9f82 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9744,8 +9744,8 @@ static uint8_t convert_stage2_attrs(CPUARMState *env,= uint8_t s2attrs) return (hiattr << 6) | (hihint << 4) | (loattr << 2) | lohint; } =20 -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 =3D regime_tcr(env, mmu_idx)->raw_tcr; uint32_t el =3D regime_el(env, mmu_idx); --=20 2.17.2