From nobody Fri Dec 19 20:37:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1572046885; cv=none; d=zoho.com; s=zohoarc; b=DAePJxySd1t2Q+L90oP0pKB5QoZj5O7WRLbhahGsEAYHd1nMm6M4aodahJ+ueYf5Dfhjaa+EiqGlaCZ3bZZDuPwTQUaUv6KngXcz8na8vWdfeMZERl6Mb/QyBM5sMUtqtU0SDyymlumDZJOOJ4bL/hJBXjVxlp6fvnbfX78YG/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572046885; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gpLO6bkwN/j/P3CsOGtvvrR++CKhcs1yv5ikEoMQjBs=; b=Nrg0EekJRKn+GDYtBim+MgHHIOk9jloJvH6KMPQw4jLQ3ZZkRjJ/XfkSjMrvp0F3LQ5ACvT/TU+2W4mSbxXIaQRflnaqjDPTVXWQFCk3kUG58dAAq0GYRZsBztGGAtcCxn/MfTXlM1IpeyuJn6DfoVYbhslFg+g0bWIa5YRoy/w= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572046885270845.2572010512238; Fri, 25 Oct 2019 16:41:25 -0700 (PDT) Received: from localhost ([::1]:37066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO9Cu-00042A-2V for importer@patchew.org; Fri, 25 Oct 2019 19:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49931) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO91E-0005Gh-Kc for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:29:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO91D-0004bD-Fy for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:29:20 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:10430) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO91D-0004CY-6v; Fri, 25 Oct 2019 19:29:19 -0400 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 26 Oct 2019 07:28:49 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2019 16:24:15 -0700 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip02.wdc.com with ESMTP; 25 Oct 2019 16:28:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1572046159; x=1603582159; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bGS+WLrBxBJ4IcdBPApTmWaBLjpm/TSDxEQpVVZJbFo=; b=XM9c9t5EZ4FH83oEpP175mOZhFQnzm6W4rowKZ9GO0uQujImvpaH/ZmI g/NiWf1Bwpfjumy2SIp8cbK1iaXZJlV+evkLlLNM9q4VCla5aU0fRyQDL 4SJAPrI3U4poWOLcl7igK7O1frVrA4nO2IreeUEghpmcL84mYvO4Z9NJc MKl9FpwOio1USAiWaY5aJm0LqTRQJBOJEimoF913vHYjv694XgQtbClIs IpZhMZuEnF7Volrisx2YYl74g5oPVXLRsj/QqcjSWqrmZnxtuF9iRJD4v kGAXF2dSjD2XwvvhOtmRZH+xHgRaGTltuFXxGUEJhCAFjbT38SwoaZiSY Q==; IronPort-SDR: sl2WcILtyUzJhUO2eYGhDv31rV31pol1yHtQCQFYhlAKqweqV0Hfld+fmayyu9W5KrKucz2nYP /6wNogRXqItT23QUvDQDMWEFV+CQJkkykUpQ60vxdwJwRYPXeKHNWv+Jl7Twtcs+gKED2YaHG3 pR0zc2m65Z2eyJpnsOfStL5OERP4pV68o5nYkNVKmgH5/0t908KHmgR0irXbGlexFAJGM+W56l Lqx7tgX/IhEQhH++TXQKL4PWzo8fuxl4a1I5LdFcxfnSSGK7P2xFe5ddJBg8eIfln/H5zqiXIF W4E= X-IronPort-AV: E=Sophos;i="5.68,230,1569254400"; d="scan'208";a="228520408" IronPort-SDR: +CwP8r8quQ6Ww6lpi6LnMsQcngbdmK5TYuCGvG9zReYn7gFIE98AuzQk8nihsyNYcRSHV/0btt eZu2QJ4IiLCeI+8Z2zgvSOx4mG/pF/zrkX5hwC3CixGtKvQBnKFV0u/1QpdR+FNZBEEmzA5reE DXi0AUgVw00LJ71g3IQqxpGs2e5lDrP+J82kUcw389R1fTdQbYMqZYZB+Qtah2ewxoXIWF01us ufrvJoF2PTkWYUB3Ir5oPcdrIH/CESNXnBqrKofMCyNCUMRaZqJYCkW4b66LjobYeNXNQRVF3e q02H1lRnHn+bUGD/Uk21t13u IronPort-SDR: SUzIfgQCbCQ71fTnCm5fmlJWP7EjZAYr/yNB6iwOxs2KNWJmBXV5cKKuEYuWkXN5boSmUaFw4P If8t84r8Pe19IhTdeRUNbIoEctnUsA0di/efmicSljwFaLfiYFgeBEZmzPT/WHdGxT4B/uQUSh rtJPpSUJdBVBSQMcMksJ7Sq1V7KSX2iWGrN68PdXJJdsuaB9I9+Bf+XNqOaXSaIJExjJ2/krlU lMER8HVdEBmQrfyxj9ZZSax+eqTHMoWCtMvy252zvWbelInwcDccVmsfFPwEsgzSXT5hmZ3TV1 Af4= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 13/27] target/riscv: Add support for virtual interrupt setting Date: Fri, 25 Oct 2019 16:23:54 -0700 Message-Id: <6b2128ecb939eb059cc69f358de3de4e760c3e03.1572045716.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.141.245 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: alistair23@gmail.com, palmer@sifive.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt --- target/riscv/cpu_helper.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 12a10e8679..bb4557df16 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -39,12 +39,27 @@ static int riscv_cpu_local_irq_pending(CPURISCVState *e= nv) { target_ulong mstatus_mie =3D get_field(*env->mstatus, MSTATUS_MIE); target_ulong mstatus_sie =3D get_field(*env->mstatus, MSTATUS_SIE); + target_ulong vsstatus_sie =3D get_field(env->mstatus_novirt, MSTATUS_S= IE); + target_ulong pending =3D env->mip & *env->mie; - target_ulong mie =3D env->priv < PRV_M || (env->priv =3D=3D PRV_M && m= status_mie); - target_ulong sie =3D env->priv < PRV_S || (env->priv =3D=3D PRV_S && m= status_sie); + target_ulong hspending =3D env->mip_novirt & env->mie_novirt; + + target_ulong mie =3D env->priv < PRV_M || (env->priv =3D=3D PRV_M && = mstatus_mie); + target_ulong sie =3D env->priv < PRV_S || (env->priv =3D=3D PRV_S && = mstatus_sie); + target_ulong vsie =3D env->priv < PRV_S || (env->priv =3D=3D PRV_S && = vsstatus_sie); + target_ulong irqs =3D (pending & ~env->mideleg & -mie) | (pending & env->mideleg & -sie); =20 + if (riscv_cpu_virt_enabled(env)) { + target_ulong pending_hs_irq =3D hspending & -vsie; + + if (pending_hs_irq) { + riscv_cpu_set_force_hs_excep(env, FORCE_HS_EXCEP); + return ctz64(pending_hs_irq); + } + } + if (irqs) { return ctz64(irqs); /* since non-zero */ } else { --=20 2.23.0