From patchwork Fri Jun 26 15:13:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 191823 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp584338ilg; Fri, 26 Jun 2020 08:21:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznXEyVAl2VdfN0dPcvEgAKfb8cY99P+bHOSVGSGVaM/6bA1f1CCGbORRPfQcdaHwfie9cI X-Received: by 2002:a25:a341:: with SMTP id d59mr5471318ybi.427.1593184884125; Fri, 26 Jun 2020 08:21:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593184884; cv=none; d=google.com; s=arc-20160816; b=pO1vhHTsZ3Y4jzLeijMfGFR1kq3tINaM6BAYa7mjnoRY+meL+tNBnJMAFChA9juZzA pYs11X6qaxA5LT6/lA/LDE3+/B+28bI2SD4PGJg406zOCTKDB4E+u504rJ010cViib+r gXGSiWiOJEyIuD9bpC/yeu8L1sCF6oS9RbUw/x9rAiEmfvgFEDJLcvAzwMQi0isZ4b5c ksF8YrweMoBNktCjBrmmqVfDt8AUymNrIywy21YSF2XlrmWePA8k5IGclKRBwBc314+7 VWMHERnTz5IYi0cedrrqjsconO3Qny8qpVqr8Dd4/Wwaqufrr/Xeqvp11XIyJsg/HQWf PMSA== 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=OiVkZdXmMFp02tYSp5OVNi5864zwIsR2HUEVngWMuuQ=; b=mo3UcYY61C2vaFJIofS0ezsamRYiUxOZiqRCPD1rmsR4R5g3oaytPPHSLEYedCNrUR Ev5p9L/kWGwDTS2owUXlCxdxpgORO0vvZHyL8D0+stgUzWIe9AeBG750+pgUfEx3CDx7 i7AEUB1pMCODje/zMgnQW3Dr8YNPZSqRozLQ6LZtsGJIgYdXDaw2TkDxtPu5sLqkLUeJ yH6UIwsCII/5KJ6KjR01T3PwfaUvnku6osKdulr1G31klL+cJznICXajjATsHdGqJgXF fElIrwixzO9WDfqcefGbf+ePg0J98Ed808+FXr/WCPXHXpMNpW4lG6HR5TlsjPIkoFt8 s4qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j8eXAvb5; 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: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e3si25014068ybr.362.2020.06.26.08.21.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 08:21:24 -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=j8eXAvb5; 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]:38144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joqAN-0002xH-JG for patch@linaro.org; Fri, 26 Jun 2020 11:21:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joq41-000298-1q for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:14:49 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joq3x-0006Jq-9c for qemu-devel@nongnu.org; Fri, 26 Jun 2020 11:14:48 -0400 Received: by mail-wm1-x341.google.com with SMTP id l17so9180574wmj.0 for ; Fri, 26 Jun 2020 08:14:44 -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=OiVkZdXmMFp02tYSp5OVNi5864zwIsR2HUEVngWMuuQ=; b=j8eXAvb5sSuAv0/OJvaqL2818q0DSyGaB/EjOLiSAvSZahnFjCa7BQSfioYUjAFnaB YfLxc9Jx1K4uLXWneasunP5PgdkFj2MufzSIIzp4ooyrG5sA0wTiz1K+N4RofsuwPd29 lmyvpm9PKaxla9v20ejK8YE0U5hbEku4w+bM73/dkRl+cAP3A2PpMmdLsSFwaQvkvxGD nTeXwMQMwzDnzuZm1tUEyJBMO1e4j/3iv8TJ0Hja/Hr467Mow/bdwdLJ9QS50ysCQPbs TlF7YigOGEa8/VuAsI6JujW+Mb5onrSIB/3gp3HkQ8C+ILj1VTJ/9v14bjK7lfNHB4W2 Z+4Q== 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=OiVkZdXmMFp02tYSp5OVNi5864zwIsR2HUEVngWMuuQ=; b=eRDG8/8DmKx/vqJkNyYUgiingRNnVaKo4ONaJk7YPIts+850VWEaSZQZ0lWielUyYe 8odqa9ufNA2n7fcp0/VfNV7CQE8H2cqGOgcUwuJgM5+NNW429CIVuXPxYu0Rvzy9mB0C a8R0hmzk1oqwsim0pIJv2nCmlM8a58L/tecrkGwCi71HL5sYptxVMRE91zZpcsu2D23F Zi4wyGh5Wfq6A4BGKGYpJqzZ02ljN/AiPu0dzaVFBJqUIa0WtTsFucFh2n0o+TrbsMmd c3fFbrukDhXB3DmvwA+vNxgeNwl7LxQWIiqqGoMZk8CSGkT8MlbVUTXvLmaabYczzrwU tb8A== X-Gm-Message-State: AOAM5316xaYedoqksxHYfydbPEdbKWBNyQ3TV6UqqMZgHvaX6NN8sPXN GpDhHXvVxTV7Bv8oRoERb1ssMeH3VfrtMQ== X-Received: by 2002:a1c:a949:: with SMTP id s70mr4314261wme.137.1593184483183; Fri, 26 Jun 2020 08:14:43 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w13sm37838852wrr.67.2020.06.26.08.14.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 08:14:42 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/57] target/arm: Add support for MTE to SCTLR_ELx Date: Fri, 26 Jun 2020 16:13:42 +0100 Message-Id: <20200626151424.30117-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626151424.30117-1-peter.maydell@linaro.org> References: <20200626151424.30117-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This does not attempt to rectify all of the res0 bits, but does clear the mte bits when not enabled. Since there is no high-part mapping of SCTLR, aa32 mode cannot write to these bits. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200626033144.790098-4-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index a29f0a28d84..8a0fb015819 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4698,6 +4698,22 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, { ARMCPU *cpu = env_archcpu(env); + if (arm_feature(env, ARM_FEATURE_PMSA) && !cpu->has_mpu) { + /* M bit is RAZ/WI for PMSA with no MPU implemented */ + value &= ~SCTLR_M; + } + + /* ??? Lots of these bits are not implemented. */ + + if (ri->state == ARM_CP_STATE_AA64 && !cpu_isar_feature(aa64_mte, cpu)) { + if (ri->opc1 == 6) { /* SCTLR_EL3 */ + value &= ~(SCTLR_ITFSB | SCTLR_TCF | SCTLR_ATA); + } else { + value &= ~(SCTLR_ITFSB | SCTLR_TCF0 | SCTLR_TCF | + SCTLR_ATA0 | SCTLR_ATA); + } + } + if (raw_read(env, ri) == value) { /* Skip the TLB flush if nothing actually changed; Linux likes * to do a lot of pointless SCTLR writes. @@ -4705,13 +4721,8 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, return; } - if (arm_feature(env, ARM_FEATURE_PMSA) && !cpu->has_mpu) { - /* M bit is RAZ/WI for PMSA with no MPU implemented */ - value &= ~SCTLR_M; - } - raw_write(env, ri, value); - /* ??? Lots of these bits are not implemented. */ + /* This may enable/disable the MMU, so do a TLB flush. */ tlb_flush(CPU(cpu));