From patchwork Mon Dec 18 11:32:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755485 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp828243wra; Mon, 18 Dec 2023 03:37:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IE44psKk52h4vicjVsUwP3dW64sm0VS8SkUllpND2GSsNy/UmrjSwCWCE/FG1m1/CLh31xq X-Received: by 2002:a05:620a:55aa:b0:77f:209:fb79 with SMTP id vr10-20020a05620a55aa00b0077f0209fb79mr18101786qkn.101.1702899427380; Mon, 18 Dec 2023 03:37:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702899427; cv=none; d=google.com; s=arc-20160816; b=VxYCV0Y2LeS3rf5NHCxzjM5XoEI/awwOP2CdLzFJs0ojXzpdn7nmYzAVLfdDLdHaFZ seUPuavcilYPAZvNriEitZO3xIVJbmkPLA/xMmHs2RdKKH6FAhTtgvRV9q5q7+Ek2KRz s9qrfs6/6tIux3615tNbtP7J+vjTlrvY9MPDGBozjXtPRMPZSn2wkSLAdHwsgOEG5IB1 WOy3hnKIma1gQp4A9VXkmKJ4Qgx5jfLNoUbNlTJzrTX/xCx6R2OrR+fAjN+BhlEnqWOa 8vHKFwEXv9MQcy4Wz7QXx382XDQOW6EDQ4UwbYWLYOAHoUvv1IiO/x2VII6CERFjxBl8 Dy9A== 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=O3/6wYv4hHy3/SVN/FzEmGqjPHnS90udBu+7RZANlgE=; fh=H2AmuqulvQE+T5zu97MCEUC3z9wF9NssS7895NhR/+c=; b=rE4j31N52I94fQ9EUBTYMa/nCVmOUSmWg2PSD3uX5FSs1C0kr0VUAkdNKWaVpEv4KR RTan2+yS+9JYthbBgvev0Hfu+7DiT3vHt//MhCf+fIj0Xi3z7LTmFLPvRJ0F0h6t+D8m Eo/RE1gWapTHjN176n4PdrBeIwA2nmd2Kilbl+cI62OwZIBXhWtoUbxs85MFctP7NbvY puWFeDVrwVzfnu+Da/OB/17Y6nZ/pfgK/reYf3C7eV6IQQNMbdxMRJdLU94aJrqbh8y8 lpTN82dAKrvSDQ2AU4UOt7yXCx/4Jx8udikv8PMY0SZW0QxBqZGZu/Zv5XjiVkeLXNcW bjkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LT0YULsW; 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 o7-20020a05620a228700b0077dc65e4308si23041627qkh.95.2023.12.18.03.37.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Dec 2023 03:37:07 -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=LT0YULsW; 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 1rFBsC-0006rv-Jh; Mon, 18 Dec 2023 06:33:24 -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 1rFBs9-0006eo-2z for qemu-devel@nongnu.org; Mon, 18 Dec 2023 06:33:21 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFBs3-0003Jy-9Q for qemu-devel@nongnu.org; Mon, 18 Dec 2023 06:33:20 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40d05ebe642so7730615e9.0 for ; Mon, 18 Dec 2023 03:33:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702899193; x=1703503993; 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=O3/6wYv4hHy3/SVN/FzEmGqjPHnS90udBu+7RZANlgE=; b=LT0YULsWsHv19LQp4YQGVpMxKj9IUSaser+QMmzXygofDvowlENUCZY9tXbgrtbJ7R iFBa8fqzEgNZXbs7sqrUZoqu8vHcDvhMzSAIYFpE653CBDviiw6GJ+eXjITjwB/wJEsO a654G7+gPBCAtLT5PPPu3wYS0jI79IYXQl3IVrQes7v0xzv9DgpbTlqMmNSkFUqOkmH4 E56h7oSWnW8v3KmPZ+lDAtw2qj1XqSmpTQFGQcEeMQ0VwMM+TUXqygwjm53+KZIfnjf/ gewOHfdROBaKHT9Tt4PzkLUlacNpWhDfvbMbxOTcvZjwTYLBfYcfWRd/2gswS45X70ux vI3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702899193; x=1703503993; 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=O3/6wYv4hHy3/SVN/FzEmGqjPHnS90udBu+7RZANlgE=; b=DrwIzJCQtHBGHgOXfJ5AJx3Z8ivDnhVe+isGCnYXOsFvLApcQX7LwSdduKST0h72Hg A2hf/8cLlTj9oVrgZIVpNuyWphtbKngoGKVaXv5NDTuPMCn+8ylS5nsGRkEV/58n4lT8 lcZuFaEyhAYJPMIeYBk5TyodslLqxe0HK/uw5/ErwPLsjbie+FjWRoviHH+81k9oAL9Q qJIz4yyAc574aOmhEONteK+SknEAub5dVAahjr3NmeBeZONX/pLRFHXmdh9x8dlfwmab 1VS21NSLQqJ8Wih5ADjui0zrInTtOxKwD2QyvBt7C0M+0JKZtgB7YvDJBh7pPxZ8G+Tq qcRg== X-Gm-Message-State: AOJu0YzTFX0qWG5Dch3dd/1OrK157fSuVSUk4s+bFtXRdTlg76LlMRbp kYGN8mcCGo1Umm+eODzEofifdA== X-Received: by 2002:a05:600c:3107:b0:40c:2c65:a156 with SMTP id g7-20020a05600c310700b0040c2c65a156mr7538135wmo.6.1702899193699; Mon, 18 Dec 2023 03:33:13 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j18-20020adff012000000b003366da509ecsm671193wro.85.2023.12.18.03.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 03:33:13 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 15/35] target/arm: Set SPSR_EL1.M correctly when nested virt is enabled Date: Mon, 18 Dec 2023 11:32:45 +0000 Message-Id: <20231218113305.2511480-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231218113305.2511480-1-peter.maydell@linaro.org> References: <20231218113305.2511480-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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,NV1} == {1,0} and an exception is taken from EL1 to EL1 then the reported EL in SPSR_EL1.M should be EL2, not EL1. Implement this behaviour. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index 44005665d12..220ee64df0d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11327,6 +11327,12 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) old_mode = pstate_read(env); 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); + } } else { old_mode = cpsr_read_for_spsr_elx(env); env->elr_el[new_el] = env->regs[15];