From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4157C433EF for ; Sat, 12 Feb 2022 00:20:43 +0000 (UTC) Received: from localhost ([::1]:34604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nIg9a-00029B-Kb for qemu-devel@archiver.kernel.org; Fri, 11 Feb 2022 19:20:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIfrW-0006Ga-PE for qemu-devel@nongnu.org; Fri, 11 Feb 2022 19:02:02 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:14721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nIfrU-0000Hg-LP for qemu-devel@nongnu.org; Fri, 11 Feb 2022 19:02:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1644624120; x=1676160120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FzZUiVDdDWtQHhwfAhtLSgxgCth6Afkp8YZ/LjldLss=; b=nP9qN1q4kR/a+StNrdZfJ61fWfFBUN3g2kMXrDY/CRSZF2xlE93nO7qz FElm7dHK7DTbEdEgBy+A9/cU6W4qKC9oFfvcDQvLdnsNiSBHjfiJHhZxl rlyv/3BzjtNFNvlGYAbMwoSysC+TTZDxzB0TlXYsbO0qzwPYYxNFrxtaT Rwr4QNU06nuuFkzfgsVghCBnPjBG15z4bQT9u39FTn9WHadLnNfHEEp+e s+KPM7npT79fZ9NRjvTnTYTFGWl8TJYSQpngUy8l67+mFA3jD1HDwkgVd c8U7DVNeLvZgSXYdP9ASXXVKuTZBQvgS5xA4yUoiyMOrdf5AFZjflyiUm w==; X-IronPort-AV: E=Sophos;i="5.88,361,1635177600"; d="scan'208";a="191669494" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 12 Feb 2022 08:01:59 +0800 IronPort-SDR: o1WQsBTOFtucrzTwTzWvSN2Cy85shNki4/Evpvl2fFS9vVlzw39drLcyDUo3dVXp/SM9368aEd aQK0lp0SkefZUqgGseUnpcDs1t6zaOIGlaLKWLeQ8o7Dn5QUOmIOxLGG+fd1O0V5TyqyMr2PNN jMmUkhyOI0cmtZFoAm/lBkQAUvKzcWDJpB73XrCJEKlyaat4yZnx5Lxhnj+h0HZyHaV0iTOXZ7 H98WvxG0yObL7XWHwjzB7kYfwdDXOUTiv9pNxmMC+MbKQjlJGmatUE2rwq79eDSPGLLEJAdzxL bAQ4MqCxc9tlEV1dcL82eVPG Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2022 15:33:44 -0800 IronPort-SDR: K7ruHrukeC54bpr0HpxuK0RTy40vUaHzv9ZXbXK7lacj7OK9GV3WnttjTVNRceIyXedxMAqdH4 ajhgxzpPQBrsbMiuZbXKwv3eYHy09w61yZ2bz28oGTtJGxadbHOhcGvNLSEtrF69LpNk/h4Z1d JsUcf63w5lgiKJQAvNXv9gkzUsh3WY590rPDo4kgJBPMR0Lmk+Pr1CHX6SPFdm5MySc1xXJ6rv GsOeObwzOYuQpayUxKqHv2xkWvj+Zqp5b23WWR49AoPhk+kRLZMXTXZvWc2UCC2hCCQ4CsX0Cd 8uo= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2022 16:01:59 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4JwVyv1wB3z1SVp1 for ; Fri, 11 Feb 2022 16:01:59 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1644624118; x=1647216119; bh=FzZUiVDdDWtQHhwfAh tLSgxgCth6Afkp8YZ/LjldLss=; b=cZfBzZKGS1O9tWSoEBoNFCFfpxEUy361Qo 2xuiKw8ARBs3Zb6MB9SKMU4xZI1BEiGdBOzbppSefjwXUm11sdMVmq4pEzAhxcmC OnCyaLkg/jeRWF2vmFWPYRdKaiTNTGHKBRKPb6W3lYYF4u7yOIsyNlSCJxgqkIwa IWvuYXCsqErR+45Q9+krcxJnkrKcSeWwZGJQLclwZRqUpn0tSUpVlhBT5T676QzA YYT4FIti+r0TQR/5h4Qa0DhJnnDdkmY0MbFWlB+wUe7p51WGH1v/gfH5VkLqlWds Y9yLG3lqwcvX8IZfXSG+35fSKL/A7laFETiO3/t3S/sIz7VVOosw== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id knuYR63dFe1I for ; Fri, 11 Feb 2022 16:01:58 -0800 (PST) Received: from toolbox.wdc.com (unknown [10.225.165.96]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4JwVyp33zxz1Rwrw; Fri, 11 Feb 2022 16:01:53 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Anup Patel , Anup Patel , Alistair Francis , Frank Chang Subject: [PULL 13/40] target/riscv: Implement SGEIP bit in hip and hie CSRs Date: Sat, 12 Feb 2022 10:00:04 +1000 Message-Id: <20220212000031.3946524-14-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220212000031.3946524-1-alistair.francis@opensource.wdc.com> References: <20220212000031.3946524-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=03511bb56=alistair.francis@opensource.wdc.com; helo=esa4.hgst.iphmx.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_HELO_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Anup Patel A hypervisor can optionally take guest external interrupts using SGEIP bit of hip and hie CSRs. Signed-off-by: Anup Patel Signed-off-by: Anup Patel Reviewed-by: Alistair Francis Reviewed-by: Frank Chang Message-id: 20220204174700.534953-3-anup@brainfault.org Signed-off-by: Alistair Francis --- target/riscv/cpu_bits.h | 3 +++ target/riscv/cpu.c | 3 ++- target/riscv/csr.c | 18 +++++++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 7c87433645..e1256a9982 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -540,6 +540,8 @@ typedef enum RISCVException { #define IRQ_S_EXT 9 #define IRQ_VS_EXT 10 #define IRQ_M_EXT 11 +#define IRQ_S_GEXT 12 +#define IRQ_LOCAL_MAX 16 =20 /* mip masks */ #define MIP_USIP (1 << IRQ_U_SOFT) @@ -554,6 +556,7 @@ typedef enum RISCVException { #define MIP_SEIP (1 << IRQ_S_EXT) #define MIP_VSEIP (1 << IRQ_VS_EXT) #define MIP_MEIP (1 << IRQ_M_EXT) +#define MIP_SGEIP (1 << IRQ_S_GEXT) =20 /* sip masks */ #define SIP_SSIP MIP_SSIP diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1238aabe3f..e1224d26dc 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -434,6 +434,7 @@ static void riscv_cpu_reset(DeviceState *dev) } } env->mcause =3D 0; + env->miclaim =3D MIP_SGEIP; env->pc =3D env->resetvec; env->two_stage_lookup =3D false; /* mmte is supposed to have pm.current hardwired to 1 */ @@ -695,7 +696,7 @@ static void riscv_cpu_init(Object *obj) cpu_set_cpustate_pointers(cpu); =20 #ifndef CONFIG_USER_ONLY - qdev_init_gpio_in(DEVICE(cpu), riscv_cpu_set_irq, 12); + qdev_init_gpio_in(DEVICE(cpu), riscv_cpu_set_irq, IRQ_LOCAL_MAX); #endif /* CONFIG_USER_ONLY */ } =20 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 41a533a310..c635ffb089 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -461,12 +461,13 @@ static RISCVException read_timeh(CPURISCVState *env= , int csrno, #define M_MODE_INTERRUPTS (MIP_MSIP | MIP_MTIP | MIP_MEIP) #define S_MODE_INTERRUPTS (MIP_SSIP | MIP_STIP | MIP_SEIP) #define VS_MODE_INTERRUPTS (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP) +#define HS_MODE_INTERRUPTS (MIP_SGEIP | VS_MODE_INTERRUPTS) =20 static const target_ulong delegable_ints =3D S_MODE_INTERRUPTS | VS_MODE_INTERRUPTS; static const target_ulong vs_delegable_ints =3D VS_MODE_INTERRUPTS; static const target_ulong all_ints =3D M_MODE_INTERRUPTS | S_MODE_INTERR= UPTS | - VS_MODE_INTERRUPTS; + HS_MODE_INTERRUPTS; #define DELEGABLE_EXCPS ((1ULL << (RISCV_EXCP_INST_ADDR_MIS)) | \ (1ULL << (RISCV_EXCP_INST_ACCESS_FAULT)) | \ (1ULL << (RISCV_EXCP_ILLEGAL_INST)) | \ @@ -748,7 +749,7 @@ static RISCVException write_mideleg(CPURISCVState *en= v, int csrno, { env->mideleg =3D (env->mideleg & ~delegable_ints) | (val & delegable= _ints); if (riscv_has_ext(env, RVH)) { - env->mideleg |=3D VS_MODE_INTERRUPTS; + env->mideleg |=3D HS_MODE_INTERRUPTS; } return RISCV_EXCP_NONE; } @@ -764,6 +765,9 @@ static RISCVException write_mie(CPURISCVState *env, i= nt csrno, target_ulong val) { env->mie =3D (env->mie & ~all_ints) | (val & all_ints); + if (!riscv_has_ext(env, RVH)) { + env->mie &=3D ~MIP_SGEIP; + } return RISCV_EXCP_NONE; } =20 @@ -1110,7 +1114,7 @@ static RISCVException rmw_sip(CPURISCVState *env, i= nt csrno, } =20 if (ret_value) { - *ret_value &=3D env->mideleg; + *ret_value &=3D env->mideleg & S_MODE_INTERRUPTS; } return ret; } @@ -1228,7 +1232,7 @@ static RISCVException rmw_hvip(CPURISCVState *env, = int csrno, write_mask & hvip_writable_mask); =20 if (ret_value) { - *ret_value &=3D hvip_writable_mask; + *ret_value &=3D VS_MODE_INTERRUPTS; } return ret; } @@ -1241,7 +1245,7 @@ static RISCVException rmw_hip(CPURISCVState *env, i= nt csrno, write_mask & hip_writable_mask); =20 if (ret_value) { - *ret_value &=3D hip_writable_mask; + *ret_value &=3D HS_MODE_INTERRUPTS; } return ret; } @@ -1249,14 +1253,14 @@ static RISCVException rmw_hip(CPURISCVState *env,= int csrno, static RISCVException read_hie(CPURISCVState *env, int csrno, target_ulong *val) { - *val =3D env->mie & VS_MODE_INTERRUPTS; + *val =3D env->mie & HS_MODE_INTERRUPTS; return RISCV_EXCP_NONE; } =20 static RISCVException write_hie(CPURISCVState *env, int csrno, target_ulong val) { - target_ulong newval =3D (env->mie & ~VS_MODE_INTERRUPTS) | (val & VS= _MODE_INTERRUPTS); + target_ulong newval =3D (env->mie & ~HS_MODE_INTERRUPTS) | (val & HS= _MODE_INTERRUPTS); return write_mie(env, CSR_MIE, newval); } =20 --=20 2.34.1