From nobody Tue Nov 26 08:32:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1709212359; cv=none; d=zohomail.com; s=zohoarc; b=ndVYul2zclMT/oZbE9fCOsIR9aALOLQQ8jpGKlKw90scWrDlT7JfUDsHvqSIGtTAPXyuZDwHuwsb4Lre6a62OFSmyGW+0mLNO2PcJXat2WmvJXRUY+sHDJmZvAch7X/PwgZ3E70DE2FdbwNhlOCFQk8tizxedbuD9azeKi1aOcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709212359; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=wAKUqxCBYvw9eDsYzm0O1Xm70fDB4Eud7U37jXd1i2Y=; b=f2ogqE46+uOLEfV+vLGobEE766kHuC1xndcdaO4dtJ/IHhu6zEUtnZEn9sixQTOdcq/iKFlQX/KcRuWUl8vKYpKD3Y/yMHwq5g8yA7IAkOyzObuv5yVoVwXEPsGe/KLs+VqOP/HN//yf8ostLr3Cf7WEgcShK7zeViIvxbpDc6o= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709212359479648.0186463416736; Thu, 29 Feb 2024 05:12:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfgCh-0005hh-Fz; Thu, 29 Feb 2024 08:12:04 -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 1rfgCa-0005Zw-JU; Thu, 29 Feb 2024 08:11:56 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfgCX-0002ek-Iy; Thu, 29 Feb 2024 08:11:56 -0500 Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Tls4v0vRzz2BdkD; Thu, 29 Feb 2024 21:09:35 +0800 (CST) Received: from kwepemi500008.china.huawei.com (unknown [7.221.188.139]) by mail.maildlp.com (Postfix) with ESMTPS id 1977C140390; Thu, 29 Feb 2024 21:11:51 +0800 (CST) Received: from huawei.com (10.67.174.55) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 29 Feb 2024 21:11:50 +0800 To: , , , , , , CC: Subject: [RFC PATCH v5 12/22] target/arm: Handle NMI in arm_cpu_do_interrupt_aarch64() Date: Thu, 29 Feb 2024 13:10:29 +0000 Message-ID: <20240229131039.1868904-13-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240229131039.1868904-1-ruanjinjie@huawei.com> References: <20240229131039.1868904-1-ruanjinjie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.174.55] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemi500008.china.huawei.com (7.221.188.139) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.190; envelope-from=ruanjinjie@huawei.com; helo=szxga04-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Reply-to: Jinjie Ruan From: Jinjie Ruan via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1709212360797100005 Content-Type: text/plain; charset="utf-8" According to Arm GIC section 4.6.3 Interrupt superpriority, the interrupt with superpriority is always IRQ, never FIQ, so the NMI exception trap entry behave like IRQ. However, VNMI can be IRQ or FIQ, FIQ can only come from hcrx_el2.HCRX_VFNMI bit, IRQ can be raised from the GIC or come from the hcrx_el2.HCRX_VINMI bit. Signed-off-by: Jinjie Ruan --- v4: - Also handle VNMI in arm_cpu_do_interrupt_aarch64(). v3: - Remove the FIQ NMI handle. --- target/arm/helper.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/arm/helper.c b/target/arm/helper.c index b796dbdf21..bd34b3506a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11459,12 +11459,21 @@ static void arm_cpu_do_interrupt_aarch64(CPUState= *cs) break; case EXCP_IRQ: case EXCP_VIRQ: + case EXCP_NMI: addr +=3D 0x80; break; case EXCP_FIQ: case EXCP_VFIQ: addr +=3D 0x100; break; + case EXCP_VNMI: + if (env->irq_line_state & CPU_INTERRUPT_VNMI || + env->cp15.hcrx_el2 & HCRX_VINMI) { + addr +=3D 0x80; + } else if (env->cp15.hcrx_el2 & HCRX_VFNMI) { + addr +=3D 0x100; + } + break; case EXCP_VSERR: addr +=3D 0x180; /* Construct the SError syndrome from IDS and ISS fields. */ --=20 2.34.1