Message ID | 20210510122548.28638-4-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | eb849d8fd542329b299be5a894d7e272eed16a49 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2791674jao; Mon, 10 May 2021 05:26:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkg9d1Wxw5f9B1N2G6z5aLdMW/FDWoMn4160RkJs85tPM1j8hIYFFKJ6+n98D2TqDf/V51 X-Received: by 2002:a9f:2662:: with SMTP id 89mr14903528uag.137.1620649598651; Mon, 10 May 2021 05:26:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649598; cv=none; d=google.com; s=arc-20160816; b=KKGClznQ6Hr5E9fIk8jYGuRIl8Kx3F2CbDIIQITZ0V4JJmA/XHJPC3bJgaancCyQXI g8B6fILb4x+xlDcf6Z3YWseqrpnofxF4oQu+fmNe9T4/kxVeLIupWMf5Vp3vR+7HyNmK XJCz1G2XhDlLLs5Y+VU6iJjBRiAFyB4XdMJTfQ+8nXFSK6mR689g4B50ydNABNurcae/ pKa8e1QuJmko5KZySMxERN1kqHBOhGpUZPeWtt+7Wh9Db8KDQd5xj1qim+wU32acbVpI kkeeAgocY6j2e32SlE6FZdffR2LL3mIJTKObIbjJoC6bkvMb2Q3AW/HJoyvsgILdzVkF S+AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BkwYn9GlEXVqXaAI4IuFCkOZqyIgHd283tDE2JpygwQ=; b=ac749x45tUsKYoqEgIF1acvlZsyfqHQJ543PZUzVIESwDiWV7M8mykW+uXc48jauhv qsNftk/ZZRgHLVXR3E8XpVE997SS6LbKn2ts7uahnMU5hFD244W1AJLlSPHN6LrEzOdK iQ2LnXvQLUahTiY08tqCPkqT9X1JROyHC1U8MvurZAb5atho1RGceCh8pHytYLka/EbR 796FIhVjK75MHXv8feCrK+37Fwp6cxoG9H4pFz1u97TtFYbtpSG2ETSQiIXNz9AHX0pF UxwyVqU0OhlMge96slKbOqc8EtN0HXKwJQxjIS1kfFXHD5+XOfHJJ3gdAa4D+KvFK4TL g9zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=poonjJnE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w190si5349762vkw.41.2021.05.10.05.26.38 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 May 2021 05:26:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=poonjJnE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1lg4zd-0005bb-Te for patch@linaro.org; Mon, 10 May 2021 08:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1lg4yy-0005Xp-8b for qemu-devel@nongnu.org; Mon, 10 May 2021 08:25:56 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1lg4yv-00038w-Bx for qemu-devel@nongnu.org; Mon, 10 May 2021 08:25:56 -0400 Received: by mail-wr1-x42e.google.com with SMTP id s8so16430772wrw.10 for <qemu-devel@nongnu.org>; Mon, 10 May 2021 05:25:52 -0700 (PDT) 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=BkwYn9GlEXVqXaAI4IuFCkOZqyIgHd283tDE2JpygwQ=; b=poonjJnEhcjlVMVm69eI7lPupqtM4AnL7da3jOGUWEeFgALbu0W/KQAP7nhyyZK9Aq SE0veHREyWmB/zJX6PmfxNQp9A+Yuzia4vAj6J73BqcgMLTpq4GUR1tecOd+/6QLDU70 TU73wXNDjve7iHML1Yxgmeoq3I3hvDnI8W8yIJP3KJVkatyhp3F6ZWX5AZmxGyb7CFok gRq5kJPeAW/r2U8Iqprvopj9DDEuMlUxGIl/IVuoRBwCtRwyTLvWgwcGz0l+UUz/PNwF YACSnhsFjL0fZshWe7W/jHcJBkZ7z5NpG/da6BQX/zbcFQUt/+vlTN+sKLAHuukXvZL7 xZxg== 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=BkwYn9GlEXVqXaAI4IuFCkOZqyIgHd283tDE2JpygwQ=; b=fbXqsRmlRehEdR20kQju1V9FrZ2/6rZGCubJAvZQsm12mPvF/YzMxBBAn+oNGrEp6/ /CAuC99IY5daaarXJv3VJWdaWH9ipOeLO0a6hKK24CPfYIipLz2m9BxURLvZXxS5AljO ZFY5hxcTA0G9BwPPi/CKEwsvVUY9iQ/KZkyZC4EThMHAgAaJ+zynpQv191qmx5wOCU86 dZNYs0XaqHWQSwKTfXB1bXSGm6CYMnDZjjur1+Pg3kW6Nx5DXZaTaRXn3dlIlzprPeAO 7c2QfEjHXatZjd1Nv2/Sfy5NhokBywDhYvCPcZsK9a1WO7aXAJRvcmKzbvkM7gUMGYQB pTUw== X-Gm-Message-State: AOAM533n14ZzfkX1ao3XvOGHZlZW16z3njeur62pICDoni64A9YqAOvN 9tb/rF2gqTq1dKLW+Q+QlVCj0e5B1TQjig== X-Received: by 2002:adf:f60c:: with SMTP id t12mr26730290wrp.152.1620649552099; Mon, 10 May 2021 05:25:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id d9sm22749897wrp.47.2021.05.10.05.25.51 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 05:25:51 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 03/26] target/arm: Fix tlbbits calculation in tlbi_aa64_vae2is_write() Date: Mon, 10 May 2021 13:25:25 +0100 Message-Id: <20210510122548.28638-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510122548.28638-1-peter.maydell@linaro.org> References: <20210510122548.28638-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index 9b1b98705f9..3b365a78cbc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4742,7 +4742,7 @@ static void tlbi_aa64_vae2is_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t pageaddr = sextract64(value << 12, 0, 56); bool secure = arm_is_secure_below_el3(env); int mask = secure ? ARMMMUIdxBit_SE2 : ARMMMUIdxBit_E2; - int bits = tlbbits_for_regime(env, secure ? ARMMMUIdx_E2 : ARMMMUIdx_SE2, + int bits = tlbbits_for_regime(env, secure ? ARMMMUIdx_SE2 : ARMMMUIdx_E2, pageaddr); tlb_flush_page_bits_by_mmuidx_all_cpus_synced(cs, pageaddr, mask, bits);