From patchwork Fri Jan 18 14:57:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1027491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="fLkzWWVa"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43h4Vt2ttgz9sLt for ; Sat, 19 Jan 2019 02:24:38 +1100 (AEDT) Received: from localhost ([127.0.0.1]:41360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkW0Z-0006lI-Sc for incoming@patchwork.ozlabs.org; Fri, 18 Jan 2019 10:24:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVbV-0002mW-In for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbT-0007OI-Cy for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:41 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbS-0007Jt-1e for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:39 -0500 Received: by mail-wr1-x42c.google.com with SMTP id p4so15417773wrt.7 for ; Fri, 18 Jan 2019 06:58:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qeVpixFLfnxn+mUTC5XuJFnTpMxObaIQ7iUYBPs+ha4=; b=fLkzWWVaUA0mj+gxdRUro4xuHq7PRWDnbpIIDDgUF94oWQaQEshYXd6llshJobpaF4 pWvxVP7sVX53JbNprHKRBp+xkz8jwxVB++ROdZz4ygEhgsLOpZodjtDfouI7VPwxApdY +Vj4pe1AsTWuvxpsVCsa6cX3rGZxfNoK1x45E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qeVpixFLfnxn+mUTC5XuJFnTpMxObaIQ7iUYBPs+ha4=; b=FdeZDg1ESZsoAxQ6qQ5FXrbOqqNQaCu+pXmanl4bPRN0Zi1EfL32lxnqenGlsXLxY7 ktckJwsWqcjDLdzNk6g+Y6dyI9I/mUJpvHfYZ3qNIvjSDnWO9xEDrt8/Ys7GWB8vQamY c81g7f4zH019JAD+lVAMyC5C59l8eALqlptPID/dpDL4nG3vjpSC+LEv+vtB1RtTtFvt CE9Zhz+UuFlP72UMswKJrXcG14jUfZxPLZqdFyzVbicVhMTqXZVC58CWfVuKMfx5LU1W twcZ/+fxHomZREcgDfgqH50yG7rLrV6X8IyRC5x3lw0Nx0m9ztqk3WtapbD8vdTIHB/0 QPwQ== X-Gm-Message-State: AJcUukeYoF8LNysEGBpUchroHh2kNvgh7s1qQiyx3UxNBDiyQwroXL3C jPBiUIHmt3uD4lqmk6B1hy86UgdAIIquIw== X-Google-Smtp-Source: ALg8bN4EBRnxBXXZNL84/zfRR7UOgHeLs8mw0+XihjPJAfu9MhPWppKJPJ6isIGwdTdAL/aS1njjEw== X-Received: by 2002:adf:e911:: with SMTP id f17mr17933471wrm.126.1547823515150; Fri, 18 Jan 2019 06:58:35 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:34 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:40 +0000 Message-Id: <20190118145805.6852-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL 24/49] 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Message-id: 20190108223129.5570-21-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- 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 fdda2c866a3..82cf6856957 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -956,4 +956,21 @@ typedef struct ARMVAParameters { 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 97a24ed5908..0f197d2dd1b 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; } -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);