Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1poBdr-00009N-Ti for mharc-qemu-riscv@gnu.org; Sun, 16 Apr 2023 19:18:43 -0400 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 1poBdq-00008g-3o for qemu-riscv@nongnu.org; Sun, 16 Apr 2023 19:18:42 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poBdm-0004Ge-Ri for qemu-riscv@nongnu.org; Sun, 16 Apr 2023 19:18:41 -0400 Received: by mail-pj1-x102a.google.com with SMTP id e4-20020a17090a4a0400b0024753a55ac9so5166334pjh.0 for ; Sun, 16 Apr 2023 16:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1681687117; x=1684279117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L2Kmqq2wmVMjQY4QcoQGOYWZvoWfxo/iRQgQoDdkzqI=; b=uzwdtHeZAgvzJ2QQ/AiEeslqj0XEClpjfozfYm3dI39QoEypWjesLEIYhCN+J6ToRW +LQ9M581kBFIAwHGe7X0JUcHMZLsbhU71iePChOzSmgXa+1O0oOKLByh3HqWsKNxMwvs eAtaW7BhhkG53M5/NKnxZ61nJ2jyfsDkyTnZLt0EU1/zQiuWn/msLSdzdf34qVVWzS3R 7L7kOdSwV+Jwjk8zClSYouroTeQEigxb0hyUGed7T6mORFLaIleQMT4y6Q2cclORebqW 0D2xjafOmEWJLSLI/gqgWgZqbANVDBLbxnEy+PumhuWZvwX/5ZoKIX08o/8Hmh/gOzR1 iOLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681687117; x=1684279117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L2Kmqq2wmVMjQY4QcoQGOYWZvoWfxo/iRQgQoDdkzqI=; b=ArfBVrTkUyR2u3egqS26Hh1T4C1DOWJNf5bq1A7HuB6JU5pi1Uzun8c1IQSgofxjqf szkenHwZsZYCDMKOnO0Tx+5XjaDPqahnkSwkkg/9LFLGQHPh4UGT1cV6GqzK1PGdAnXW GxYVhbb0R7+dQo66ePwd91O9m8xUOFQ/kaErgNMOcuZyaNgA2Bmwy2Hq0RT5YJczn18x i+sl6LRiCCIdhBSU7O/VSMv8Ky/MuTulvSRQ+ZTb/L6x9R2mCvTQH+mufIC4q0rxi9Hz XMoyYN+BNL3Gf82L9jQbtyW3cpP+LRBULxW1LxU2eSdfSlB9Rf0plkxT6CRygNUvZJfB WrZA== X-Gm-Message-State: AAQBX9dD5QEdQpoOzVBNxuJNCijtOYgWNwYJ1HWyECPVKFbcROl+8evL 6dOxSQ6dvQXMGEcCqyH1xWcaLg== X-Google-Smtp-Source: AKy350ZfYa5j8afZHQCGMXD0xeQkl7r5NW8T+6Z4XkMSd5ryi4Ib8Far5Ve2+2OGnd28Kt/aYemXNg== X-Received: by 2002:a17:902:ced0:b0:1a6:b1a2:5f21 with SMTP id d16-20020a170902ced000b001a6b1a25f21mr8250997plg.8.1681687116797; Sun, 16 Apr 2023 16:18:36 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:1800:f680:20ea:ba1c:5673:16e6]) by smtp.gmail.com with ESMTPSA id jl3-20020a170903134300b001a6b02659c0sm3087847plb.159.2023.04.16.16.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Apr 2023 16:18:36 -0700 (PDT) From: Drew Fustini To: Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Nicolas Pitre , Adrien Ricciardi , =?UTF-8?q?Kornel=20Dul=C4=99ba?= Cc: Drew Fustini Subject: [RFC PATCH 1/8] riscv: implement Ssqosid extension and sqoscfg CSR Date: Sun, 16 Apr 2023 16:20:43 -0700 Message-Id: <20230416232050.4094820-2-dfustini@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230416232050.4094820-1-dfustini@baylibre.com> References: <20230416232050.4094820-1-dfustini@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=dfustini@baylibre.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-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-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Apr 2023 23:18:42 -0000 From: Kornel Dulęba Implement the sqoscfg CSR defined by the Ssqosid ISA extension (Supervisor-mode Quality of Service ID). The CSR contains two fields: - Resource Control ID (RCID) used determine resource allocation - Monitoring Counter ID (MCID) used to track resource usage The CSR is defined for S-mode but accessing it when V=1 shall cause a virtual instruction exception. Implement this behavior by calling the hmode predicate. Link: https://github.com/riscv-non-isa/riscv-cmqri/blob/main/riscv-cbqri.pdf Signed-off-by: Kornel Dulęba [dfustini: rebase on v8.0.0-rc4, reword commit message] Signed-off-by: Drew Fustini --- Note: the Ssqosid extension and CBQRI spec are still in a draft state. The CSR address of sqoscfg is not final. disas/riscv.c | 1 + target/riscv/cpu.c | 2 ++ target/riscv/cpu.h | 3 +++ target/riscv/cpu_bits.h | 5 +++++ target/riscv/csr.c | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+) diff --git a/disas/riscv.c b/disas/riscv.c index d6b0fbe5e877..94336f54637b 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -2100,6 +2100,7 @@ static const char *csr_name(int csrno) case 0x0143: return "stval"; case 0x0144: return "sip"; case 0x0180: return "satp"; + case 0x0181: return "sqoscfg"; case 0x0200: return "hstatus"; case 0x0202: return "hedeleg"; case 0x0203: return "hideleg"; diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1e97473af27b..fb3f8c43a32d 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -114,6 +114,7 @@ static const struct isa_ext_data isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(smaia, true, PRIV_VERSION_1_12_0, ext_smaia), ISA_EXT_DATA_ENTRY(ssaia, true, PRIV_VERSION_1_12_0, ext_ssaia), ISA_EXT_DATA_ENTRY(sscofpmf, true, PRIV_VERSION_1_12_0, ext_sscofpmf), + ISA_EXT_DATA_ENTRY(ssqosid, true, PRIV_VERSION_1_12_0, ext_ssqosid), ISA_EXT_DATA_ENTRY(sstc, true, PRIV_VERSION_1_12_0, ext_sstc), ISA_EXT_DATA_ENTRY(svadu, true, PRIV_VERSION_1_12_0, ext_svadu), ISA_EXT_DATA_ENTRY(svinval, true, PRIV_VERSION_1_12_0, ext_svinval), @@ -1397,6 +1398,7 @@ static Property riscv_cpu_extensions[] = { DEFINE_PROP_BOOL("svadu", RISCVCPU, cfg.ext_svadu, true), + DEFINE_PROP_BOOL("ssqosid", RISCVCPU, cfg.ext_ssqosid, true), DEFINE_PROP_BOOL("svinval", RISCVCPU, cfg.ext_svinval, false), DEFINE_PROP_BOOL("svnapot", RISCVCPU, cfg.ext_svnapot, false), DEFINE_PROP_BOOL("svpbmt", RISCVCPU, cfg.ext_svpbmt, false), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 638e47c75a57..ffc1b5009d15 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -222,6 +222,8 @@ struct CPUArchState { target_ulong mcause; target_ulong mtval; /* since: priv-1.10.0 */ + target_ulong sqoscfg; + /* Machine and Supervisor interrupt priorities */ uint8_t miprio[64]; uint8_t siprio[64]; @@ -454,6 +456,7 @@ struct RISCVCPUConfig { bool ext_icboz; bool ext_zicond; bool ext_zihintpause; + bool ext_ssqosid; bool ext_smstateen; bool ext_sstc; bool ext_svadu; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index fca7ef0cef91..d11a3928735e 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -217,6 +217,7 @@ /* Supervisor Protection and Translation */ #define CSR_SPTBR 0x180 #define CSR_SATP 0x180 +#define CSR_SQOSCFG 0x181 /* Supervisor-Level Window to Indirectly Accessed Registers (AIA) */ #define CSR_SISELECT 0x150 @@ -898,4 +899,8 @@ typedef enum RISCVException { #define MHPMEVENT_IDX_MASK 0xFFFFF #define MHPMEVENT_SSCOF_RESVD 16 +/* SQOSCFG BITS (QOSID) */ +#define SQOSCFG_RCID 0x00000FFF +#define SQOSCFG_MCID 0x0FFF0000 + #endif diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d522efc0b63a..5769b3545704 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -2700,6 +2700,37 @@ static RISCVException write_satp(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +static RISCVException check_sqoscfg(CPURISCVState *env, int csrno) +{ + RISCVCPU *cpu = env_archcpu(env); + + if (!cpu->cfg.ext_ssqosid) { + return RISCV_EXCP_ILLEGAL_INST; + } + + /* + * Even though this is an S-mode CSR the spec says that we need to throw + * and virt instruction fault if a guest tries to access it. + */ + return hmode(env, csrno); +} + +static RISCVException read_sqoscfg(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val = env->sqoscfg; + return RISCV_EXCP_NONE; +} + +static RISCVException write_sqoscfg(CPURISCVState *env, int csrno, + target_ulong val) +{ + env->sqoscfg = val & (SQOSCFG_RCID | SQOSCFG_MCID); + return RISCV_EXCP_NONE; +} + + + static int read_vstopi(CPURISCVState *env, int csrno, target_ulong *val) { int irq, ret; @@ -4182,6 +4213,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { /* Supervisor Protection and Translation */ [CSR_SATP] = { "satp", smode, read_satp, write_satp }, + /* Supervisor-Level Quality of Service Identifier */ + [CSR_SQOSCFG] = { "sqoscfg", check_sqoscfg, read_sqoscfg, write_sqoscfg }, + /* Supervisor-Level Window to Indirectly Accessed Registers (AIA) */ [CSR_SISELECT] = { "siselect", aia_smode, NULL, NULL, rmw_xiselect }, [CSR_SIREG] = { "sireg", aia_smode, NULL, NULL, rmw_xireg }, -- 2.34.1