From patchwork Sat Feb 1 19:28:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1232288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=o6riD22J; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48949g4KTNz9sRQ for ; Sun, 2 Feb 2020 06:37:27 +1100 (AEDT) Received: from localhost ([::1]:49396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixya5-0001JT-E8 for incoming@patchwork.ozlabs.org; Sat, 01 Feb 2020 14:37:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58800) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixySi-0007g3-QB for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixySh-0006ub-S0 for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:48 -0500 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:41584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ixySh-0006tu-Lx for qemu-devel@nongnu.org; Sat, 01 Feb 2020 14:29:47 -0500 Received: by mail-pf1-x441.google.com with SMTP id j9so2187558pfa.8 for ; Sat, 01 Feb 2020 11:29:47 -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 :mime-version:content-transfer-encoding; bh=Norg9fPtXVkCxAbFxqHU+mKSGwd6dWrkKXpQEb83JIc=; b=o6riD22JdE0vtcQzXipfO5ZeBNdpHJVMwCDEYVec3QkaTID68o6Dd+hfP7sCkGD2Qk 8GCnYRBX7O5I/sMQhKzRuvZof7FqB0YVyRko+e5faQQJHG1dwMlbttP7d5p8mkZu0uIY 6OygE/TNOq/gOc5fnIE8SbaTtOmAZNavbgtlkM52NJxxG38/y9SSoYQVZD9wQgu+j3Zi DCx940eNNB3Fwv+oajNiKpZiAVGLxTw0SP8lmbZhg7s12im8h2Wd+IvPNnFzQVx4BY3t kFEIkkCsG+w2a1LYh9JnPsMtL60oXHXEzcUDYi9niIQfXaBCJCSatBkx9Ychw6As4xUt DPmA== 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=Norg9fPtXVkCxAbFxqHU+mKSGwd6dWrkKXpQEb83JIc=; b=Dmm3sgwYQzNlUniuV/FpXaht0zO0G9e9jJhJbCtzSDeEE6mtwW1qucBYKVpaKAUEZ3 JDQNL3mc/Qayh5RNXRK23FC5mYPM8vRFvN7NM5aALpiThVravy0zNBaNoy6Ab2etiEDr FTEbsgnD8H6C0FNwSrD09Rud+IPRoH5Trm5U0eLo9eMt2fLKCSFuU1tTYnZVn7WzUDVb dgriljBU1SSpxUk+ajxr57+N+r+EOab4aghBYxDvcCWYLj6XKnPiTn7pIKEQE1vaa0tr g+FWs1RHNoHSBSg2NRbUwuRQnAOVN5FY2qO8WXBfrk5h+KLvA7qanNUdxdUC+wt5zCyN LeFA== X-Gm-Message-State: APjAAAXOE5ikP7XLeNEKLxD8vJAHMxqiXZen4tOActbw+gW/6zc0vXvk B2xCqrQW7BVp1hiNzxcscePaPkx/950= X-Google-Smtp-Source: APXvYqxPTJkr1P8auMD8FJ7kRayioEO30jRFI9YRcKtOzMxb7DkN9eqZRlKhuaG39G2vakjd2CVpuw== X-Received: by 2002:a62:7a8a:: with SMTP id v132mr17567217pfc.111.1580585386460; Sat, 01 Feb 2020 11:29:46 -0800 (PST) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id l7sm3668509pga.27.2020.02.01.11.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2020 11:29:45 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 24/41] target/arm: Update ctr_el0_access for EL2 Date: Sat, 1 Feb 2020 11:28:59 -0800 Message-Id: <20200201192916.31796-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200201192916.31796-1-richard.henderson@linaro.org> References: <20200201192916.31796-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::441 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, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Update to include checks against HCR_EL2.TID2. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/arm/helper.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index e41bece6b5..72b336e3b5 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5264,11 +5264,27 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { static CPAccessResult ctr_el0_access(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) { - /* Only accessible in EL0 if SCTLR.UCT is set (and only in AArch64, - * but the AArch32 CTR has its own reginfo struct) - */ - if (arm_current_el(env) == 0 && !(env->cp15.sctlr_el[1] & SCTLR_UCT)) { - return CP_ACCESS_TRAP; + int cur_el = arm_current_el(env); + + if (cur_el < 2) { + uint64_t hcr = arm_hcr_el2_eff(env); + + if (cur_el == 0) { + if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) { + if (!(env->cp15.sctlr_el[2] & SCTLR_UCT)) { + return CP_ACCESS_TRAP_EL2; + } + } else { + if (!(env->cp15.sctlr_el[1] & SCTLR_UCT)) { + return CP_ACCESS_TRAP; + } + if (hcr & HCR_TID2) { + return CP_ACCESS_TRAP_EL2; + } + } + } else if (hcr & HCR_TID2) { + return CP_ACCESS_TRAP_EL2; + } } if (arm_current_el(env) < 2 && arm_hcr_el2_eff(env) & HCR_TID2) {