From patchwork Fri Jun 26 03:31:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 191754 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp102558ilg; Thu, 25 Jun 2020 20:32:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKVSHYKqIc4z/CzHT6KvXfvkOZ2XjTchfLuYQqw87VfO9d6Z6RrTfn8/h44Nns/08bb6Hx X-Received: by 2002:a25:7cc4:: with SMTP id x187mr1702077ybc.245.1593142333212; Thu, 25 Jun 2020 20:32:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593142333; cv=none; d=google.com; s=arc-20160816; b=ThObMUGuKjZQMCMEHEOb/MNnfb6S3qMQtzVmhzZnhrHJO/haCoFeDByOljS2T4gmS8 YB+mcf4u0kSbk+mUx3vDENfSMtgWUvpTXfNHAsdWOMqYQVE6amSx1oyZNSiSDf2yzE9O q2dZEZUL144/ojv9i4H9LU9vjUYsABESefabRJx9KcYJgyDC6eeoPKhyxVotfeeJJkfy 4PdoWArD4cUI0TFFhJYbIkJrMUEqZXxquSUx0FnkpKifcNgyY7Dy+oEKfU2GF3iNxupo raNgBCWtGlJVaZuGsOWamq5NWifwLdZLEN2hUWu9ij6Gk3P0mjCWTG7MxV9tQtnXFDGa EQpg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=AlIgM6p7oAT+zID+rk9BPqh6DFQ2CZ3GNfJxW/eCI2s=; b=rZ9KRXLmxud7XheFU7v3SIwHI1KDnKa0EgWT6I8r7Oz+8ZUz8OyjXE2Shl7+D1NQpN sCvWL59TvTqpThMbLYf30xQjFSnQw80GKWsJNqVYsEHJVkrcEoTb5NW1Uhxlf2bgWWKp /6fhpdCmNrcI+Hhhvx2hFklah3CQ3esUkTZTBhDn+RmRDDeEIBXc+4qMP136MNfc2quQ uc6cIsjzu81rlP76FWoHmW4edzGBDuimBdObthnRoIphExaLlMNWoYWB4HoV6K11ZQd1 ql/2U8wnPEbLwtTTqXiYfSmYvzZ2idT2q/xfIXtOZgJbxkxHfBCxVaPAO9wDRcwiuwMb WvDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=xA2Xzxig; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 125si14688746ybk.185.2020.06.25.20.32.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jun 2020 20:32:13 -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=fail header.i=@linaro.org header.s=google header.b=xA2Xzxig; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jof64-0007so-J6 for patch@linaro.org; Thu, 25 Jun 2020 23:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jof5n-0007nn-8y for qemu-devel@nongnu.org; Thu, 25 Jun 2020 23:31:55 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:38654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jof5l-0001jL-M2 for qemu-devel@nongnu.org; Thu, 25 Jun 2020 23:31:54 -0400 Received: by mail-pg1-x543.google.com with SMTP id e8so4364609pgc.5 for ; Thu, 25 Jun 2020 20:31:53 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=AlIgM6p7oAT+zID+rk9BPqh6DFQ2CZ3GNfJxW/eCI2s=; b=xA2Xzxig8dhVyBh+QPpd0NMUwylXdMUKmxhQkR/Y90dkDvfVlvXOSYPJ3aJhXEIefJ TcBjeN8hSOlEgAaCi8iAhBFUD1uQ34PBKOo4mdwTcXX6tQPQpTexXdM3PyICgkQpLGGL 6s8bnsFMHpymFVS6pSv2T4/YqPECOsobo8EDfwWmJafDBgtSZzL37cpM2vfJ3HosU+wU JMI0Bw4R9A72aQ71ziuoyqzqnlJEF7WmPe8DRG0K7Dgk4KnuKbp1SfvFG5akIs3mrYVG 1CpBKlZshKDQzLz0P/rfwyhQS7kf1wN98+TawFIsRaK8fE8L75QcqW/p7JRo5dpM+S27 Tcpg== 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:mime-version:content-transfer-encoding; bh=AlIgM6p7oAT+zID+rk9BPqh6DFQ2CZ3GNfJxW/eCI2s=; b=ZnUEWag2c83MYX/qJClFrFM+dHuwXLkOEFmCILhagD0vhJMbjeMUhHNegA22C3m4BO fRHfXEl+uen38qvn9aWEIkx/lVWHH6WL4Scb0i0e0fq1H7seEMAow/fjSD8KVQczJtcP eyrPaFgiCNW5+9bIbixI5bapP4Ja4RMiHNHd5E4HtJj2u5NNkgSiDUG0WbsafiDRfKWh gM3f/cIbIkAXGVhwISmuSpyp6oQGZEoOJSl44Ym9HNcTccIr6uHiRGDlaH6HHmDgal0+ dJ+LUDdJ2IRUc5UzLUWvZy+jvSUxV1TCYfZABhcfmJ6BUnaM2B69SD4m4SMssBaNtf+v bZkw== X-Gm-Message-State: AOAM531fje0g9ojM9qfxPJR9fZr+P1JuOYC3tIj4YMkM/FNhO3zVaN0p I/2h5PzaorhfzVNGi6oGUaN3VeW8hA8= X-Received: by 2002:a63:5a01:: with SMTP id o1mr885754pgb.337.1593142311901; Thu, 25 Jun 2020 20:31:51 -0700 (PDT) Received: from localhost.localdomain (174-21-143-238.tukw.qwest.net. [174.21.143.238]) by smtp.gmail.com with ESMTPSA id y27sm1605256pgc.56.2020.06.25.20.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 20:31:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v9 04/46] target/arm: Add support for MTE to HCR_EL2 and SCR_EL3 Date: Thu, 25 Jun 2020 20:31:02 -0700 Message-Id: <20200626033144.790098-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200626033144.790098-1-richard.henderson@linaro.org> References: <20200626033144.790098-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::543; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, david.spickett@linaro.org, steplong@quicinc.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- v8: Include HCR_DCT. --- target/arm/helper.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 8a0fb01581..d6c326b58e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2021,6 +2021,9 @@ static void scr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) if (cpu_isar_feature(aa64_pauth, cpu)) { valid_mask |= SCR_API | SCR_APK; } + if (cpu_isar_feature(aa64_mte, cpu)) { + valid_mask |= SCR_ATA; + } } else { valid_mask &= ~(SCR_RW | SCR_ST); } @@ -5248,17 +5251,22 @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask) if (cpu_isar_feature(aa64_pauth, cpu)) { valid_mask |= HCR_API | HCR_APK; } + if (cpu_isar_feature(aa64_mte, cpu)) { + valid_mask |= HCR_ATA | HCR_DCT | HCR_TID5; + } } /* Clear RES0 bits. */ value &= valid_mask; - /* These bits change the MMU setup: + /* + * These bits change the MMU setup: * HCR_VM enables stage 2 translation * HCR_PTW forbids certain page-table setups - * HCR_DC Disables stage1 and enables stage2 translation + * HCR_DC disables stage1 and enables stage2 translation + * HCR_DCT enables tagging on (disabled) stage1 translation */ - if ((env->cp15.hcr_el2 ^ value) & (HCR_VM | HCR_PTW | HCR_DC)) { + if ((env->cp15.hcr_el2 ^ value) & (HCR_VM | HCR_PTW | HCR_DC | HCR_DCT)) { tlb_flush(CPU(cpu)); } env->cp15.hcr_el2 = value;