From patchwork Thu Jan 11 11:04:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 761823 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp2337566wrz; Thu, 11 Jan 2024 03:10:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+K44YXZ93no3QZHCrQsaJdBnrRKbgsVw++ClTpsZiWe2J8+vPBveiKZyeZDoWvkkILA4x X-Received: by 2002:a05:620a:a8c:b0:781:54e7:5a5b with SMTP id v12-20020a05620a0a8c00b0078154e75a5bmr1160808qkg.92.1704971453430; Thu, 11 Jan 2024 03:10:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704971453; cv=none; d=google.com; s=arc-20160816; b=NJjxm/6tfIZcidHLkzwrsrQASWS4C5qD/NvDowMu0bV2061gP2dlnkkuwWZKcN0Jeh HgAtUEeXyFzfQH0U9c30zh/c/hTBs7zKq4XV++WJLy/0nptAFkV78zjWT/yeFFSWEHOc 216ROCzyGr/lxxjSJVbK5e0ejp+o2gJb+z0iK9JAh018LRoxjVBxqk8gBXd/CSXxQ5JJ XUYtnBGB4asGTpihhpXys2wTjdVpDr7xsuHeiM6DUb6GVqo5+XOLo+nZR+3n0pp+WuFY uuNxr3oweC2KCfnUmAwSqEWL4v5VHAQBIjjj0XS6wWMzs0XygZCZgZCrSAm54w5dY8iQ 602w== 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=7DGlJd8zO7MQUcG5o1SU1odAfTI4o+ayPUZ+8rGfmO8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=epJYELF3eBQR1Q7H8w/MYD3tKFZOLhhN7h+X89TOFK/wAoTDHvPHShRuZfvmHiFPIi 6yXkkQBkYUeYzULzmzrRd5NmlAJN6/gm4Qmj1jsI7AOci38F1jBpS7uUvXjsii2YpUm9 vjuTz4NMNQGA/z5goscocKdtK8Edwm4ejYHXwWjnIuilybLzI9qIpy7BbgSSYf2MSrHO x/GmTH9DL4V4nf2zJvx7CHwg6G++M0+We7EtA4RqSf1+MDGoBNU9sLCYPFB6nWUfeocL k422XIYpalnthBt7egb+HQ9IZouhyt84KwXx3OoC7L8Ra2mw4H75IJilqOABIUzRTfLb jENA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=q6f5r0sX; 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 y6-20020a05620a09c600b0078323154c8esi667137qky.445.2024.01.11.03.10.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2024 03:10:53 -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=q6f5r0sX; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNssl-0001j4-8h; Thu, 11 Jan 2024 06:05:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rNssB-0001Mr-51 for qemu-devel@nongnu.org; Thu, 11 Jan 2024 06:05:19 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNss8-0004RV-Nh for qemu-devel@nongnu.org; Thu, 11 Jan 2024 06:05:18 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-33678156e27so4461010f8f.1 for ; Thu, 11 Jan 2024 03:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704971115; x=1705575915; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7DGlJd8zO7MQUcG5o1SU1odAfTI4o+ayPUZ+8rGfmO8=; b=q6f5r0sXYkCzmf3EvFlix7bfhI7CA5YpuM+73fI6MmhRBm2wmNm3gUHvFiU7TGdLaD pvxv5dxZYdGe++I8GuZ4Egx/k1Cx+cfbnc3VFJLU/FEB9Q14so8kIRK/ThXlCmy1bCLF zunMQtd8/lsU+LGYlh22AnkEBx/SR5uB3PIJdsfeY1q+fDUrHe3A7sRkKOOpQilwRkdl GhyITkDYhoBaovnCz124Gh8Dy+MFDqIXaA5w/c76n5LCbu/vwkiubRQ9lsi2wT+bo1+M P1XhdFOBj/ueliNQwG3KH+ZNEqmeOr84YXXfYP0IR3k5JGvWynlrokOaU6SPWxgOBo9B ruZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704971115; x=1705575915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7DGlJd8zO7MQUcG5o1SU1odAfTI4o+ayPUZ+8rGfmO8=; b=pjH6s8WylfcqedzFu0WrTI6wHl8tgX47kWcntzys5lgzU1VbdfKSnn+pzqAvJb0XiT N7eEOFnkOmRAjZnh7SsWvvi2FrI9gPr5sE7mkWEW8AwPFKYPNns/dtMIKB13YCzEM+i3 wWgmAHKvglOzIrXItZNVoar+l2s79XMGGw/7QLSlMzK0MmN90NeHf+M4Ng7G5KIZbLhR lCsETCaAgLo9UWDw6mecAy7ohii1Sz8O+IwQOorMcvbwSAaCDozkJ/Y8MQhycdaxkQR1 Lz/2JzhRZTQaR0OmFQ9eKjBUmSwh6Opqvt83gQwD2MydMHDzpBVYqxhJqMVe9CPvARtm D0sQ== X-Gm-Message-State: AOJu0Yw4OdR98r4Db9sV8c0498rDBQZGPCDhEQG8BeFN0q+Qu6L7uEKe ViAo13a+IhfeCExtzrj059G3A0y7351sDHUZ+W9Hk5XGSq8= X-Received: by 2002:a5d:6091:0:b0:336:70ed:4cc with SMTP id w17-20020a5d6091000000b0033670ed04ccmr567863wrt.95.1704971115391; Thu, 11 Jan 2024 03:05:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v30-20020adf8b5e000000b0033690139ea5sm951323wra.44.2024.01.11.03.05.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 03:05:15 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/41] target/arm: Make NV reads of CurrentEL return EL2 Date: Thu, 11 Jan 2024 11:04:44 +0000 Message-Id: <20240111110505.1563291-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240111110505.1563291-1-peter.maydell@linaro.org> References: <20240111110505.1563291-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org FEAT_NV requires that when HCR_EL2.NV is set reads of the CurrentEL register from EL1 always report EL2 rather than the real EL. Implement this. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Tested-by: Miguel Luis --- target/arm/tcg/translate-a64.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index f5377dbaf2d..ed1cc019a4c 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2241,12 +2241,17 @@ static void handle_sys(DisasContext *s, bool isread, } return; case ARM_CP_CURRENTEL: - /* Reads as current EL value from pstate, which is + { + /* + * Reads as current EL value from pstate, which is * guaranteed to be constant by the tb flags. + * For nested virt we should report EL2. */ + int el = s->nv ? 2 : s->current_el; tcg_rt = cpu_reg(s, rt); - tcg_gen_movi_i64(tcg_rt, s->current_el << 2); + tcg_gen_movi_i64(tcg_rt, el << 2); return; + } case ARM_CP_DC_ZVA: /* Writes clear the aligned block of memory which rt points into. */ if (s->mte_active[0]) {