From patchwork Thu Jan 11 11:04:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 761805 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp2336280wrz; Thu, 11 Jan 2024 03:07:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKumyzrTcl8EGN+z9zZSEEkZ8CXckrJiQfGLdGk7mceKc1IJTiCbSsJUX0ySs3eT7mg2wM X-Received: by 2002:a05:622a:11d4:b0:429:af93:4dbb with SMTP id n20-20020a05622a11d400b00429af934dbbmr287387qtk.66.1704971272217; Thu, 11 Jan 2024 03:07:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704971272; cv=none; d=google.com; s=arc-20160816; b=jQQup39JnX+7XdBAeyjroNCnlNPJUzso1StdHC54SdTWmmmyhK+F/PbJMUkQV1p+mN ilGnruaXVv+CQe+UAuV0nHQfDQ7sUtcwQ211njmvmrsWC62N+YDkkV73ESPNEwOwCIJk jXQhQRcRH35Lj1WhQoy0jyjrEirk6UmcbbuS/2EBlrnDVaHUOtG82Ev/RbU2mjxvxeC9 eYhaSXjZUn6d5271tjIvrJ++KZV1a7RGuwVDcIbVbyyYgYyUljjY8RfgxLij17H8EDl+ sUNrr4vcuCcjasJVZIwYovm3O+DaiPP8nqvkrA0YwT1w+/LZ1xc50GTzYDRm1YhJ0rAz yJ4w== 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=15rlOByBdh8+iLkfPVBVi/SbZWKpkYx6lLXZPs5/sUg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=mw2Y2aUwuoIg1Hl9MZ5Y4QDVsDmyE+dxNGQ/nKDr+H/+cB2faPoTU/WAZqsXNaaY+S XZcggPcATZ2s6JF+iC8jmJwN6iijU5c2RHAbgGUU9FAQwSPElCbj+cJlXNLv6jeYjsO7 y5evZGsaSGV1EG6RRT35KHE/JCElE1oacCtuw+YShkszQar90zYfzNF9isw/w7dVmDxM UTEYw3UGfL5skHk+gVKqHGmVNuw1DvRgRAWqBM4F+MXGRUhRcXWTgy6er1Z5N8sLFYeP L//VX5pEGzqaSz8pTmDZPSiILYsWQEFMoLsoabheufGJNXLsMZdpeeIhi28Uph8WxQye SjDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eC6N9UXj; 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 v1-20020a05622a130100b0042992268779si717452qtk.665.2024.01.11.03.07.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2024 03:07:52 -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=eC6N9UXj; 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 1rNssX-0001Rr-Em; Thu, 11 Jan 2024 06:05:41 -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 1rNssI-0001P3-6t for qemu-devel@nongnu.org; Thu, 11 Jan 2024 06:05:31 -0500 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rNssE-0004Ue-6c for qemu-devel@nongnu.org; Thu, 11 Jan 2024 06:05:24 -0500 Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2cceb5f0918so55495551fa.2 for ; Thu, 11 Jan 2024 03:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704971120; x=1705575920; 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=15rlOByBdh8+iLkfPVBVi/SbZWKpkYx6lLXZPs5/sUg=; b=eC6N9UXjVt1qnvvzfr3z9DcPxagmUb08+KiZbKptTUsFpO0rn4qYluWu+aEmP0Krua A9EURHtU5j9qcHiFxPZttrH7vZAqkxEY84nBVPPiH50uDW9uI9mUZFTkz7LtbX40oqWA 6z04TbFOk5KnNpchLM/h1sqzIXGWGXipVI+Dl5Dc4y1kAoWlWNFKt6c7dWyCiOLqa1DH HiX+xpMLJXhpXfO8DwuX5ZzgTMRbU3/hwISIGoFJ6XTmKRiUyUJpSH1IeVL9WLH7w7wv Dumg9Aqh3sx3Q3w8NwYIrbw21I44NWtVV+Lra0u4vAAAAi8q9wDRO/sVAA3cqHu8aLaT yQiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704971120; x=1705575920; 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=15rlOByBdh8+iLkfPVBVi/SbZWKpkYx6lLXZPs5/sUg=; b=xR6HmtnQ7OYNIcK6WhSNAX0uXFNZpzXBQZswEcxkN5EETlAQCX2tLvEdS+HGkFCCqc 22V4KNsvq3MlNuuZlZRe79RMp7uOeVHiLG8Sr2elQjhsnxIgGGtg0NZMCTyVx2N6VH4j rJKmtQzbwLHhUB/QP0f8vx61sH84EtzFrvB3BgMveUEYb9UmKZI74pODjNSX5S5Oxq2M FMbtOk2F03BRdp3YbcUTe/hhuLEmtj1A8TwE/VgGapQi0jKKntdamJ6vA+0eH+w2aBs6 TUtltbKubEA5kGOYp3BfPFxlPivIldnkNB3b/I8vlyIos0gZM9STTw1D6Gixd3o5KJuh NiYQ== X-Gm-Message-State: AOJu0YwGlzeMuPMyO0VzwW+r6mJ2xk5xLJ6cFxyZsT3DjkM0kbKejiv4 P2fZbvsHSNHNl3mta/IlUIQq+yRz6TWK73HglXaZPMPcxdU= X-Received: by 2002:a2e:9bd9:0:b0:2cc:f41d:8f41 with SMTP id w25-20020a2e9bd9000000b002ccf41d8f41mr183499ljj.39.1704971120265; Thu, 11 Jan 2024 03:05:20 -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.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 03:05:19 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/41] target/arm: Handle FEAT_NV2 changes to when SPSR_EL1.M reports EL2 Date: Thu, 11 Jan 2024 11:04:54 +0000 Message-Id: <20240111110505.1563291-31-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::229; envelope-from=peter.maydell@linaro.org; helo=mail-lj1-x229.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 With FEAT_NV2, the condition for when SPSR_EL1.M should report that an exception was taken from EL2 changes. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Tested-by: Miguel Luis --- target/arm/helper.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 53bd6c85990..b9b3aaf4db7 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11328,10 +11328,18 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) aarch64_save_sp(env, arm_current_el(env)); env->elr_el[new_el] = env->pc; - if (cur_el == 1 && new_el == 1 && - ((arm_hcr_el2_eff(env) & (HCR_NV | HCR_NV1)) == HCR_NV)) { - /* I_ZJRNN: report EL2 in the SPSR by setting M[3:2] to 0b10 */ - old_mode = deposit32(old_mode, 2, 2, 2); + if (cur_el == 1 && new_el == 1) { + uint64_t hcr = arm_hcr_el2_eff(env); + if ((hcr & (HCR_NV | HCR_NV1 | HCR_NV2)) == HCR_NV || + (hcr & (HCR_NV | HCR_NV2)) == (HCR_NV | HCR_NV2)) { + /* + * FEAT_NV, FEAT_NV2 may need to report EL2 in the SPSR + * by setting M[3:2] to 0b10. + * If NV2 is disabled, change SPSR when NV,NV1 == 1,0 (I_ZJRNN) + * If NV2 is enabled, change SPSR when NV is 1 (I_DBTLM) + */ + old_mode = deposit32(old_mode, 2, 2, 2); + } } } else { old_mode = cpsr_read_for_spsr_elx(env);