From patchwork Fri Dec 14 05:24:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10730569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 15B9191E for ; Fri, 14 Dec 2018 05:49:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05E542D131 for ; Fri, 14 Dec 2018 05:49:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE5652D135; Fri, 14 Dec 2018 05:49:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90DDE2D131 for ; Fri, 14 Dec 2018 05:49:12 +0000 (UTC) Received: from localhost ([::1]:59551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXgLX-000065-Ud for patchwork-qemu-devel@patchwork.kernel.org; Fri, 14 Dec 2018 00:49:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXfxu-0004mW-4H for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXfxo-0005Tr-4c for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:45 -0500 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:34182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXfxk-0005SN-Ft for qemu-devel@nongnu.org; Fri, 14 Dec 2018 00:24:36 -0500 Received: by mail-ot1-x342.google.com with SMTP id t5so4342304otk.1 for ; Thu, 13 Dec 2018 21:24:35 -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=4KA8zbUOIv7pZJObxZbOzQNnbAlJZmuvqEm8g4lAP+s=; b=TQ3aLo3cl7nr5EfDIErWRNS/bSjD5AuDwH9j/yGIHDYY1q7Y+sjAomQjZPE9VPCpsB ZTJvx8fQ7zG+or6ugAQh1wR7rrxkT3d64t2UZYJDv0PlWNt7UAhXAN9hiPCeQwL0aFin YH6IAXf/ll7vMlqWtB1q4/eKKEBE0/JfGMtkY= 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=4KA8zbUOIv7pZJObxZbOzQNnbAlJZmuvqEm8g4lAP+s=; b=BzOMU7QZGVHO4aLPRPMn6OZdpBsCyJqFB35MC16IAI9PgdXWLp81KhAIJAiQuu4g5E 6jN2eKYAs2KQvWDJNBghlPxT6er0XdqRdfleDNanddqzXsasROK40PBglUXHpRfbW8q6 vBk4hsSCcFongQuer9TbeYvNfPhuxwpKB93gAgQPHaadjTV+2wfXZdJn+45HiaBKi1Jd CuyUi3IYHVIsp/PwDJrJS38UEdL+NUhUXBbRFLP/NvgSqg2NadXGlgOWAKHG4E09U2x1 0sUW8xKtd5p8CBoS6Z5h0IqXDTuthNHPHBF91Aww7NkWeofh6k6N6vJV2QHtAYMVwf1e ewtg== X-Gm-Message-State: AA+aEWZCIPg3+fpRCdUL6IzkyoS16qlgPmBWA3s2NIlQ+dDcIt+Mse1y 5srJILNdzqtR/3GR2dftlWu5E3zvYvaRjQ== X-Google-Smtp-Source: AFSGD/XdOvwY0v7eHmrZ2PyOH9dfMBlWEHv0Jsl9cdMQ8BOfsomYS4OdVkGfDWn5XJPYcix7HBFmVw== X-Received: by 2002:a9d:76da:: with SMTP id p26mr1084334otl.366.1544765074876; Thu, 13 Dec 2018 21:24:34 -0800 (PST) Received: from cloudburst.twiddle.net ([187.217.227.243]) by smtp.gmail.com with ESMTPSA id r1sm1845379oti.44.2018.12.13.21.24.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Dec 2018 21:24:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 23:24:02 -0600 Message-Id: <20181214052410.11863-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181214052410.11863-1-richard.henderson@linaro.org> References: <20181214052410.11863-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::342 Subject: [Qemu-devel] [PATCH v2 19/27] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-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 9ef9d01ee2..4fbef58126 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -951,4 +951,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 bd1b683766..b9ffc07fbc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9702,8 +9702,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);