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: 153767 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1685852ljp; Thu, 13 Dec 2018 21:49:49 -0800 (PST) X-Google-Smtp-Source: AFSGD/WAkF67Y7tA+0N5yYTsC/dokFdL+ScudDQmBOzlLrPTnZeTzIxFi48fUZdTf1M5VKLmQgDY X-Received: by 2002:a37:bb82:: with SMTP id l124mr838093qkf.188.1544766589862; Thu, 13 Dec 2018 21:49:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544766589; cv=none; d=google.com; s=arc-20160816; b=EYxSIjKZJQUoF29BIZlQ6o1oxacaNvXCqUW7ujxMkmzEud3V0uwnNZNRxwcSfglA04 Crj5FlaCL8hYeE+8+QQ3LW3qekLBxGzd7o3xe3bnMGSgTMxBDXV0wNRCv3zEq4+igZzf Vdu7HDYtRg22R4klgxl8o5k9E1cJ4GIV3semRcWs35dhm4qciw0e72Y2gI+2CJYyh9tg gGGSi8wZb8uwPecLa0jqrXADQPg+JNm8jhzVbI9dnWXmxTt6Y4OFzU0kkFaI/UX9deJW Vc6IOkh1BlIBjwdqol2uMSElUnehwQHKvMWdVrnbczPfvRjPyIhXp3+EqWoslPrWr0k5 2BAA== 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=4KA8zbUOIv7pZJObxZbOzQNnbAlJZmuvqEm8g4lAP+s=; b=Yb9UPIfUsE22xvySjqnIIqyK2uu73ZeN8SOd7d8lZ0JpYDoUdVniHEsBoZP9+1AlYD dRjyptiBTJoxvXwVxWZmg28yTJghBegdlUQ6q8FUpHI9MQk3+qUBMThk5sgp5X4rI/Mf aW2tkfLzl2hnE6cXfGE2Ug/I3xJtsuU1q+Z7UXdk6t2b37XRy33dQCXyheW4DErmGseD V1xgl3DQk55r54PeSpOqb+vIIAMse19L0I2m49f2TyUcuSlU6uRpqMC9lQf/gOgeVEUu 3BcYC4C8BailWzcZO6+bRarEl7tvEFG6m4vUw7CgN+D2ZRyzAd+4rrGKuJwxQL2ywYt9 dy3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TQ3aLo3c; 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 i31si45003qtb.238.2018.12.13.21.49.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 21:49:49 -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=TQ3aLo3c; 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]:59551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXgM9-000065-EN for patch@linaro.org; Fri, 14 Dec 2018 00:49:49 -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-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+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 | 17 +++++++++++++++++ target/arm/helper.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell 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);