From patchwork Thu Feb 13 14:41:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183364 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp621544ile; Thu, 13 Feb 2020 06:55:08 -0800 (PST) X-Google-Smtp-Source: APXvYqzASCAyGmIzfIZNpLQkGWDqRDWxZzBZHNDhoLCg7Yz1qysGShFx8YWrGOyGpmPaunZOFZLz X-Received: by 2002:a0c:f485:: with SMTP id i5mr24526629qvm.8.1581605708485; Thu, 13 Feb 2020 06:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581605708; cv=none; d=google.com; s=arc-20160816; b=sPzIaZ3xU1N7rlurvsLEJMudZFxYKWUildAsrhRhOUgvq4T2OM84JEnee8JE1s5tkU jYVq1kzEW7mdSupnvcjB5hzox8o270goCyDhzmV+6oW7vldmZYKDo87n8hnr0k/gWL2W MBiZZ2rf6X5LShjOjwoNbZeayXfcdXPjuEfdP50skxQGF+1majlcieR6aC4U3jY6pQBI HiHynExdfYp6N3qczjl9W2fyXOivVmUkUquGzlpc4ctY+XWizt6fuhEP3Pixq7SbOEWs gTC3zdho7+b4aK1TQg2JLkwleWs2f9IEhOa/dHGxJ4N3oDHNj7N4c9/7Dyt0FwGboaUP rBxQ== 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=PpjQIC0RqFe6Xqx3OKTth2xnBQFxNcA4Bz7zhZ8w2yo=; b=JtD+eWT3ltZ5maaFDrIKaPHUheSYH3+bEa7CEpJ2eiEU0XcBDr8kiuGKuTuGrqFeRa oalBru6M67nWAE3tFwqvkujYCQrPf0OC3pB+cC7oBC8jVppgjCsNyLffkRch2ins9JQO LeU8MxOELGVlGro/M2NtPx/V/NeksfgpBWtzv+4B4N7NvyB6JCEmtAkRXyVLAV0WVL4o Bd69ZlJQ8C+OFlpztea+0vcXw9X4Ok0mytxBHkIgyVSlvf2pjWOb3yLvqV9HyiZVM2Hn S9hiiXqqJZ+7VEErPvNkADCNodJuRyrpNMYG/s9cXCFqpsZlNsMYJSZBEmOtt2y8Ec0G px4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PmmZA9L+; 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 143si1309547qki.202.2020.02.13.06.55.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 06:55:08 -0800 (PST) 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=PmmZA9L+; 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]:53986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2FtT-0003Uh-U8 for patch@linaro.org; Thu, 13 Feb 2020 09:55:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60428) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fh9-0004dw-Ef for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Fh7-0002AT-AS for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:23 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33129) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fh7-000293-3q for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:21 -0500 Received: by mail-wm1-x342.google.com with SMTP id m10so7273305wmc.0 for ; Thu, 13 Feb 2020 06:42:21 -0800 (PST) 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=PpjQIC0RqFe6Xqx3OKTth2xnBQFxNcA4Bz7zhZ8w2yo=; b=PmmZA9L+B0ZIdy4qnvFayRiSVN5eCh+0lOseJK+7gPXpAlRQGRz/ie3pIMjwlU2V3f C7ji/Qf7MeK2LBtIiiq+YZoaxSnogqS8zUujI3QSgu7p4E1OVb0GPttaqkzBWd+56RIH gXs0+AncGc5lCZxtWO/nsH4HStUL+/Mgdk+drSB25fFT2Qy4neSU6ZX1RoYUjUbDkLYu 63+2IMFvJDTFufTDytx4EbSPKKH7hG/UAeYKF2tqvj7d7sq6qfj27Yw1XeUKnHwdTyT3 df+2aoBg0QewMUJYm+hEWyZTUkmgDUrhSpIWEGny78YDzZ8y53/OVweKfNjS89W2ajOv HlHQ== 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=PpjQIC0RqFe6Xqx3OKTth2xnBQFxNcA4Bz7zhZ8w2yo=; b=HQm+/ENKdCD9x6nXPFtlIPy8X+qQjYi3RbvJcKL/HmiE2HKgS/gsMFTE9i3od+F1Tg nTfC7Fj52PRSNGSbrG7SyXLnFY9j0Hntk2NlSHv3ABUJ+jV2KFcg0RaiIICEuhf4c73d vncm0sKaJPwFq/Ks83qZAL6GvZ7j6k00VD3vD5D8hdP8Cg3be7khHh9Xz1WuIltUUJ/x HYRiKxJ5q3KnaZSgqSqfwz5qg/r4nsCEVSoPeaGxdoSUp6nnMCQKLDVi0gj11Qk/Ez2u 95iTlke/nyE4fPvf4nUC9uuxUoPxl69V3VvIvVHzRoaPGwwyb6XBAayBEuraCcUrKkj8 rEYA== X-Gm-Message-State: APjAAAWYk6x2BHRVGq/e5JZEmhOvGnI7Py6NCdGB3IXcR2UuFqACYyh3 Y94WQv4qhN5QeG6k7IvfuWpme6IUK5k= X-Received: by 2002:a7b:c93a:: with SMTP id h26mr6493868wml.83.1581604939817; Thu, 13 Feb 2020 06:42:19 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.42.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:42:19 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 28/46] target/arm: Implement UAO semantics Date: Thu, 13 Feb 2020 14:41:27 +0000 Message-Id: <20200213144145.818-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 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 We need only override the current condition under which TBFLAG_A64.UNPRIV is set. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200208125816.14954-20-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 11a5f0be52f..366dbcf460d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12198,28 +12198,29 @@ static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, } /* Compute the condition for using AccType_UNPRIV for LDTR et al. */ - /* TODO: ARMv8.2-UAO */ - switch (mmu_idx) { - case ARMMMUIdx_E10_1: - case ARMMMUIdx_E10_1_PAN: - case ARMMMUIdx_SE10_1: - case ARMMMUIdx_SE10_1_PAN: - /* TODO: ARMv8.3-NV */ - flags = FIELD_DP32(flags, TBFLAG_A64, UNPRIV, 1); - break; - case ARMMMUIdx_E20_2: - case ARMMMUIdx_E20_2_PAN: - /* TODO: ARMv8.4-SecEL2 */ - /* - * Note that E20_2 is gated by HCR_EL2.E2H == 1, but E20_0 is - * gated by HCR_EL2. == '11', and so is LDTR. - */ - if (env->cp15.hcr_el2 & HCR_TGE) { + if (!(env->pstate & PSTATE_UAO)) { + switch (mmu_idx) { + case ARMMMUIdx_E10_1: + case ARMMMUIdx_E10_1_PAN: + case ARMMMUIdx_SE10_1: + case ARMMMUIdx_SE10_1_PAN: + /* TODO: ARMv8.3-NV */ flags = FIELD_DP32(flags, TBFLAG_A64, UNPRIV, 1); + break; + case ARMMMUIdx_E20_2: + case ARMMMUIdx_E20_2_PAN: + /* TODO: ARMv8.4-SecEL2 */ + /* + * Note that EL20_2 is gated by HCR_EL2.E2H == 1, but EL20_0 is + * gated by HCR_EL2. == '11', and so is LDTR. + */ + if (env->cp15.hcr_el2 & HCR_TGE) { + flags = FIELD_DP32(flags, TBFLAG_A64, UNPRIV, 1); + } + break; + default: + break; } - break; - default: - break; } return rebuild_hflags_common(env, fp_el, mmu_idx, flags);