From nobody Tue May 21 07:25:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1596891996; cv=none; d=zohomail.com; s=zohoarc; b=WKRYG2/Fgn35jGTyEn+wLS1x+wCVZyafH3mB1r5HhDSNQamdnWow20IKdXGmXTjIksOAj1Qfip1Pxov0vCQ365ykDAFVJsjlF6v7k04uNE+ltkTHljDRjUAY34qdOGMTfLBLlzy/1Rnbm+TZfo/Xhm5XHYOc5rvosyPYU0XbFdY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596891996; 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=MW3DZaA0cPRetzOJHOEnr2p1Qwr/h9P0QQbQ/RWFC4M=; b=TaIQZZUCNoZle39jneHGVic7NOzfoC66WSaqVbAuoDJH2xeAXK+bzthk4lhZ2Ipe520/rHelCOYG+YYQxATuVKdEliK7cyLHkXMlXmoPG2UXcRQevj2AV3gadLFbSROVxNSUA58rOMlBnyqNgfMw8vabGJOkPsfQs2JCTjmC3jo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1596891996934604.6992272457453; Sat, 8 Aug 2020 06:06:36 -0700 (PDT) Received: from localhost ([::1]:46630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4OYV-0005pw-Ic for importer@patchew.org; Sat, 08 Aug 2020 09:06:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4KsN-0000j7-VT; Sat, 08 Aug 2020 05:10:51 -0400 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:53702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4KsM-0000b0-CM; Sat, 08 Aug 2020 05:10:51 -0400 Received: by mail-pj1-x1044.google.com with SMTP id l60so2169996pjb.3; Sat, 08 Aug 2020 02:10:49 -0700 (PDT) Received: from localhost.localdomain (183178047145.ctinets.com. [183.178.47.145]) by smtp.gmail.com with ESMTPSA id i11sm13312700pjv.30.2020.08.08.02.10.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 02:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MW3DZaA0cPRetzOJHOEnr2p1Qwr/h9P0QQbQ/RWFC4M=; b=YwkhA2J1SX43I8x94fuarPMxS/+hhO+8DOjSPyHAfraBQ76yynR3uzeQqVhbLqvEme E22AiSLD/Va4gCahWrwA86hxhII+NvF8mFf06kLhIGXJnYJHdFv0D387LquNaJV456gM tDnY/ilt9ss3kg5XS9AbLh8dXAzpkq+F9zpb9a7P0zZrKU/PKdcC9KZ2f5KmL7azd/pr uonm47YKgn6AW9aBr63egVz6vFORQkKxR5trs7H8IcQyGGC3+NwwO6XziRwk1uksWQkr v/KfyH/533szE2esGPy9rthpZUu8E0fCwzZF/vKTSR9GvHHM5nh71VaZCaFgHQqROX4m ToVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MW3DZaA0cPRetzOJHOEnr2p1Qwr/h9P0QQbQ/RWFC4M=; b=VBGGsYBgzZ/bYeQFqxOWVLZhee/vXp63txxzOTTHLCm2xJEIKhkeiZmFwmZ2HmJg9A yzqt3nNCwqNTzzx1Q/vix2MTWrSYn0jOH9PmSza7untgCTOVCgH02pzdPSRFOVFsb4rV gTQwmcvjdINxpx6Ez88CxXlb3hX5c72rrQ2lVpYqldLo8QuZODkWPr8k0e57hfgVTR+b Jnc/f6D4/G4fi5dbJ8H4KwJ3BRTuszMKMvw7nng1FfL9QZEKVhnSapDG27lHma2VRuYg +C1NtxqXny2KGncdIwFwkcyKpo6G3JwCLLSSas7lcCqAKeywbjfWUX6RBmLGO2bWExYD 3cEA== X-Gm-Message-State: AOAM530eP0LqQxgpoHuvYKEiJ3XUUFEO2PqZ39tjrjZXMb5sdu51wdWP 9gEJRQrHskSkpOfmDOr+mIMnkEwLCaW3Ew== X-Google-Smtp-Source: ABdhPJzrynnq8jldIm7Q6LT8BQy/kVoB9DH/LzIHVNqXddCjx0mP5C5+cwgixXVu7CrTMI9EJNZpHw== X-Received: by 2002:a17:90a:d081:: with SMTP id k1mr17196543pju.177.1596877848631; Sat, 08 Aug 2020 02:10:48 -0700 (PDT) From: Hongzheng-Li X-Google-Original-From: Hongzheng-Li To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 1/4] Define ePMP mseccfg Date: Sat, 8 Aug 2020 17:09:47 +0800 Message-Id: <20200808090950.13-2-Ethan.Lee.QNL@gmail.com> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> References: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1044; envelope-from=ethan.lee.qnl@gmail.com; helo=mail-pj1-x1044.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 08 Aug 2020 08:59:47 -0400 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: Hou Weiying , sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, Hongzheng-Li , Alistair.Francis@wdc.com, palmer@dabbelt.com, Myriad-Dreamin 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" From: Hou Weiying Currently using 0x390 and 0x391 for x-epmp (experimental). This may change = in the future spec. Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin --- target/riscv/cpu_bits.h | 3 +++ target/riscv/gdbstub.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 7f64ee1174..9a8a6be534 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -214,6 +214,9 @@ #define CSR_MTINST 0x34a #define CSR_MTVAL2 0x34b =20 +/* Enhanced PMP */ +#define CSR_MSECCFG 0x390 +#define CSR_MSECCFGH 0x391 /* Physical Memory Protection */ #define CSR_PMPCFG0 0x3a0 #define CSR_PMPCFG1 0x3a1 diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index eba12a86f2..de5551604a 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -132,6 +132,8 @@ static int csr_register_map[] =3D { CSR_MIP, CSR_MTINST, CSR_MTVAL2, + CSR_MSECCFG, + CSR_MSECCFGH, CSR_PMPCFG0, CSR_PMPCFG1, CSR_PMPCFG2, --=20 2.20.1 From nobody Tue May 21 07:25:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1596891989; cv=none; d=zohomail.com; s=zohoarc; b=BXnp5GVW6Ym14ckP7Skq1DI+y+mkhv0Cx0EIfOFZ4FFtP0HOgUQz/WvC75eaTpsTgocLDBTfahli4NG2xV1PPUpBfy60Xamgu4bmWyVVBlyv7XngWu8ji57xIjsV2h35f0SlrSU4HgztZHwYXo7qrm1wkI4TMLqiGkml6tVszAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596891989; 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=IqYdAZooT8lM28ETEjL5hU1NnnBa1o7OjjnUhzOuR3Y=; b=MpbrRzSUHM2m1r++sT9u2vz4F9lvVIuxGr3XBZH3hlxg4U0/ZiQkuN4A2fvg5m0sr/yncgnr5gpTf+yoswsTaaU2ihJGvnjyxs35+A7O3EemTa5AwxUAHTca5toRTeipTIabt69chW+fLz96QnDG0CI7BMvEVJ3F6HgUnvIqHgM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1596891989495539.8647532784656; Sat, 8 Aug 2020 06:06:29 -0700 (PDT) Received: from localhost ([::1]:45856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4OYN-0005X1-QU for importer@patchew.org; Sat, 08 Aug 2020 09:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4KsS-0000jj-5G; Sat, 08 Aug 2020 05:10:56 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:55604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4KsQ-0000bM-4Y; Sat, 08 Aug 2020 05:10:55 -0400 Received: by mail-pj1-x1043.google.com with SMTP id 2so2165283pjx.5; Sat, 08 Aug 2020 02:10:53 -0700 (PDT) Received: from localhost.localdomain (183178047145.ctinets.com. [183.178.47.145]) by smtp.gmail.com with ESMTPSA id i11sm13312700pjv.30.2020.08.08.02.10.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 02:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IqYdAZooT8lM28ETEjL5hU1NnnBa1o7OjjnUhzOuR3Y=; b=FZ89hNCg5E4Um6oxdgXwESusEbjxji5pxx1l1cIebwGYZS8XI7kIcDKWKrbkoNaHql ZYkpR8vbUNY3pvxzO/y2U+Q2iIpVv/JqSozWx5XFXCySxr6Z/VTGZm6Kp7UZt55t4S78 rQEPwgAJ8/ZgyYz5sRdsQIxtu3jEyssZL71x7Wv4fxAfEwt1wDd4X/OP011jOhuE1DBn yuj86esER2+h0B4jCeruMloxJ+GvBflxm146YuV+RRN4BqLyGNr+nxtx4pwX7cs0jiyD 2TW0URTDhipfH4qXlkTb9tVWfqfNJFlcHi21dvcV9yvm3BaPYnMOe157QXwFt+CV7s6M dZzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IqYdAZooT8lM28ETEjL5hU1NnnBa1o7OjjnUhzOuR3Y=; b=HCIAWka3MyMY1e12fm8iR1YcC9VR6/V9cBPMN4nrxaJ2ilMTj9RNwz7u81aUKHZV6S ggq2InOIVxHyq48qhtyZxjLddxKcn4yF/256bfTMKZ6jSyWLyihKeufV7xAIEgySb72t SBF03mGk0/WgolVec6mYIrl47T96FUJJF5bakk3mUEsyJw2jAnPYbuL6mUbaNXWDD1dW wX7d/H66W7YhxlQTfclloCeVBvqSVdaZgN0nsQurnuZitmZcL8t4BF+1arm9dWiDIyBo MsQPScWhjXH606VndF/L6HkDitTJeZogLGFKLzarMrKmQuSQxwAJ4FUoB0YBlN2lpPay gIUQ== X-Gm-Message-State: AOAM532tHrUKmyxhoHMSiETf7rJTpqinMv7esVz+ZeytBoXMI0WfyuXB SVOAxj5c4aVYgqXRoBk0eztmYOviEbcZKg== X-Google-Smtp-Source: ABdhPJx43Hf8Nd0dXu/jhposdQ03b7fvkBnCiJS3tn4w22VYioWDlEoXQmUlkkPP8jetJcnJ6spr/g== X-Received: by 2002:a17:90a:8d0b:: with SMTP id c11mr17922923pjo.196.1596877851775; Sat, 08 Aug 2020 02:10:51 -0700 (PDT) From: Hongzheng-Li X-Google-Original-From: Hongzheng-Li To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 2/4] Implementation of enhanced PMP(ePMP) support Date: Sat, 8 Aug 2020 17:09:48 +0800 Message-Id: <20200808090950.13-3-Ethan.Lee.QNL@gmail.com> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> References: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1043; envelope-from=ethan.lee.qnl@gmail.com; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 08 Aug 2020 08:59:47 -0400 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: Hou Weiying , sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, Hongzheng-Li , Alistair.Francis@wdc.com, palmer@dabbelt.com, Myriad-Dreamin 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" From: Hou Weiying The ePMP can be found in: https://docs.google.com/document/d/1Mh_aiHYxemL0umN3GTTw8vsbmzHZ_nxZXgjgOUz= bvc8/edit#heading=3Dh.9wsr1lnxtwe2 Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin --- target/riscv/pmp.c | 134 ++++++++++++++++++++++++++++++++++---- target/riscv/pmp.h | 12 ++++ target/riscv/trace-events | 4 ++ 3 files changed, 138 insertions(+), 12 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 0e6b640fbd..8df389cecd 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -34,6 +34,26 @@ static void pmp_write_cfg(CPURISCVState *env, uint32_t a= ddr_index, static uint8_t pmp_read_cfg(CPURISCVState *env, uint32_t addr_index); static void pmp_update_rule(CPURISCVState *env, uint32_t pmp_index); =20 +static char mode_to_char(int mode) +{ + char ret =3D 0; + switch (mode) { + case PRV_U: + ret =3D 'u'; + break; + case PRV_S: + ret =3D 's'; + break; + case PRV_H: + ret =3D 'h'; + break; + case PRV_M: + ret =3D 'm'; + break; + } + return ret; +} + /* * Accessor method to extract address matching type 'a field' from cfg reg */ @@ -99,7 +119,28 @@ static inline uint8_t pmp_read_cfg(CPURISCVState *env, = uint32_t pmp_index) static void pmp_write_cfg(CPURISCVState *env, uint32_t pmp_index, uint8_t = val) { if (pmp_index < MAX_RISCV_PMPS) { - if (!pmp_is_locked(env, pmp_index)) { + /* + * mseccfg.RLB is set + */ + if (MSECCFG_RLB_ISSET(env) || + /* + * mseccfg.MML is set + */ + (MSECCFG_MML_ISSET(env) && + /* + * m model and not adding X bit + */ + (((val & PMP_LOCK) !=3D 0 && (val & PMP_EXEC) !=3D PMP_EXEC) || + /* + * shared region and not adding X bit + */ + ((val & PMP_LOCK) !=3D PMP_LOCK && + (val & 0x7) !=3D (PMP_WRITE | PMP_EXEC)))) || + /* + * mseccfg.MML is not set + */ + (!MSECCFG_MML_ISSET(env) && !pmp_is_locked(env, pmp_index)) + ){ env->pmp_state.pmp[pmp_index].cfg_reg =3D val; pmp_update_rule(env, pmp_index); } else { @@ -230,6 +271,18 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ulo= ng addr, =20 /* Short cut if no rules */ if (0 =3D=3D pmp_get_num_rules(env)) { + if (MSECCFG_MMWP_ISSET(env)) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - %c mode access denied\n", + mode_to_char(mode)); + return false; + } + if (MSECCFG_MML_ISSET(env) && (mode !=3D PRV_M || (privs & PMP_EXE= C))) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - %c mode access denied\n", + mode_to_char(mode)); + return false; + } return true; } =20 @@ -261,16 +314,65 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ul= ong addr, const uint8_t a_field =3D pmp_get_a_field(env->pmp_state.pmp[i].cfg_reg); =20 - /* - * If the PMP entry is not off and the address is in range, do the= priv - * check - */ if (((s + e) =3D=3D 2) && (PMP_AMATCH_OFF !=3D a_field)) { - allowed_privs =3D PMP_READ | PMP_WRITE | PMP_EXEC; - if ((mode !=3D PRV_M) || pmp_is_locked(env, i)) { - allowed_privs &=3D env->pmp_state.pmp[i].cfg_reg; + /* + * If the PMP entry is not off and the address is in range, + * do the priv check + */ + if (!MSECCFG_MML_ISSET(env)) { + /* + * If mseccfg.MML Bit is not set, do pmp priv check + */ + allowed_privs =3D PMP_READ | PMP_WRITE | PMP_EXEC; + if ((mode !=3D PRV_M) || pmp_is_locked(env, i)) { + allowed_privs &=3D env->pmp_state.pmp[i].cfg_reg; + } + } else { + /* + * If mseccfg.MML Bit set, do the enhanced pmp priv check + */ + if (env->pmp_state.pmp[i].cfg_reg & PMP_LOCK) { + /* + * Shared Region + */ + if ((env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE)) =3D=3D PMP_WRITE) { + allowed_privs =3D PMP_EXEC | ((mode =3D=3D PRV_M && + (env->pmp_state.pmp[i].cfg_reg & PMP_EXEC)) ? + PMP_READ : 0); + } else { + allowed_privs =3D env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE | PMP_EXEC); + + if (mode !=3D PRV_M && allowed_privs) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - %c mode access denied\n", + mode_to_char(mode)); + ret =3D 0; + break; + } + } + } else { + /* + * Shared Region + */ + if ((env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE)) =3D=3D PMP_WRITE) { + allowed_privs =3D PMP_READ | ((mode =3D=3D PRV_M || + (env->pmp_state.pmp[i].cfg_reg & PMP_EXEC)) ? + PMP_WRITE : 0); + } else { + allowed_privs =3D env->pmp_state.pmp[i].cfg_reg & + (PMP_READ | PMP_WRITE | PMP_EXEC); + if (mode =3D=3D PRV_M && allowed_privs) { + qemu_log_mask(LOG_GUEST_ERROR, + "pmp violation - m mode access denied\= n"); + ret =3D 0; + break; + } + } + } } - if ((privs & allowed_privs) =3D=3D privs) { ret =3D 1; break; @@ -284,15 +386,23 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ul= ong addr, /* No rule matched */ if (ret =3D=3D -1) { if (mode =3D=3D PRV_M) { - ret =3D 1; /* Privileged spec v1.10 states if no PMP entry mat= ches an - * M-Mode access, the access succeeds */ + ret =3D !MSECCFG_MMWP_ISSET(env); /* PMP Enhancements */ + if (MSECCFG_MML_ISSET(env) && (privs & PMP_EXEC)) { + ret =3D 0; + } } else { ret =3D 0; /* Other modes are not allowed to succeed if they d= on't * match a rule, but there are rules. We've checked = for * no rule earlier in this function. */ } } - + if (ret) { + trace_pmp_hart_has_privs_pass_match( + env->mhartid, addr, size, privs, mode); + } else { + trace_pmp_hart_has_privs_violation( + env->mhartid, addr, size, privs, mode); + } return ret =3D=3D 1 ? true : false; } =20 diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h index 8e19793132..7db2069204 100644 --- a/target/riscv/pmp.h +++ b/target/riscv/pmp.h @@ -36,6 +36,12 @@ typedef enum { PMP_AMATCH_NAPOT /* Naturally aligned power-of-two region */ } pmp_am_t; =20 +typedef enum { + MSECCFG_MML =3D 1 << 0, + MSECCFG_MMWP =3D 1 << 1, + MSECCFG_RLB =3D 1 << 2 +} mseccfg_field_t; + typedef struct { target_ulong addr_reg; uint8_t cfg_reg; @@ -58,7 +64,13 @@ target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32_= t reg_index); void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, target_ulong val); target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index); +void mseccfg_csr_write(CPURISCVState *env, target_ulong val); +target_ulong mseccfg_csr_read(CPURISCVState *env); bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr, target_ulong size, pmp_priv_t priv, target_ulong mode); =20 +#define MSECCFG_MML_ISSET(env) get_field(env->mseccfg, MSECCFG_MML) +#define MSECCFG_MMWP_ISSET(env) get_field(env->mseccfg, MSECCFG_MMWP) +#define MSECCFG_RLB_ISSET(env) get_field(env->mseccfg, MSECCFG_RLB) + #endif diff --git a/target/riscv/trace-events b/target/riscv/trace-events index 4b6c652ae9..4f877f90f7 100644 --- a/target/riscv/trace-events +++ b/target/riscv/trace-events @@ -6,3 +6,7 @@ pmpcfg_csr_read(uint64_t mhartid, uint32_t reg_index, uint6= 4_t val) "hart %" PRI pmpcfg_csr_write(uint64_t mhartid, uint32_t reg_index, uint64_t val) "hart= %" PRIu64 ": write reg%" PRIu32", val: 0x%" PRIx64 pmpaddr_csr_read(uint64_t mhartid, uint32_t addr_index, uint64_t val) "har= t %" PRIu64 ": read addr%" PRIu32", val: 0x%" PRIx64 pmpaddr_csr_write(uint64_t mhartid, uint32_t addr_index, uint64_t val) "ha= rt %" PRIu64 ": write addr%" PRIu32", val: 0x%" PRIx64 +mseccfg_csr_read(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": read m= seccfg, val: 0x%" PRIx64 +mseccfg_csr_write(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": write= mseccfg, val: 0x%" PRIx64 +pmp_hart_has_privs_pass_match(uint64_t mhartid, uint64_t addr, uint64_t si= ze, uint64_t privs, uint64_t mode) "hart %"PRId64 "pass PMP 0 match addr:%"= PRIu64" size:%"PRIu64 "privs: %"PRIu64 "mode: %"PRIu64 +pmp_hart_has_privs_violation(uint64_t mhartid, uint64_t addr, uint64_t siz= e, uint64_t privs, uint64_t mode) "hart %"PRId64 "pass PMP 0 match addr:%"P= RIu64" size:%"PRIu64 "privs: %"PRIu64 "mode: %"PRIu64 --=20 2.20.1 From nobody Tue May 21 07:25:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1596891886; cv=none; d=zohomail.com; s=zohoarc; b=Wqj/EWuj4H6oHuOQ2Mnzl5bN+fGgZBEwrLfaz2YYXNwPnSXDCTrEmuxqal0h92cmw6RMzlBreDPqOd2HU2X0OkBOHlVLx0I2PP11+QgtaPbaF2/UuWdpd/13RXzLCgwhbI8kP7cFLsloVkI6HFy7nWhcqA9JItZ5cEwIx88eVVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596891886; 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=fWKpYnUfRg0gxuuuKT5iT/I7/Zv/OLd6oIWfqWvvQUg=; b=WBLKAAsE68E3eCIKSyJpRDSElKLAchC/JAR6yRY94f/UpMepixF0hJ3pRNoYS8Vtm+QT16el7Y5jJa+fxV1DVy8Ot/z7j9esEQswrhMzllbOy0KHnZTUJO2bi7j32PlW3OBDISYRICcKJaZqQN+FeQjP8UAPxGRXZaLsYdD3T8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1596891886457420.6454070297957; Sat, 8 Aug 2020 06:04:46 -0700 (PDT) Received: from localhost ([::1]:37040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4OWi-0001wm-Tr for importer@patchew.org; Sat, 08 Aug 2020 09:04:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4KsV-0000kW-6D; Sat, 08 Aug 2020 05:10:59 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:53702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4KsT-0000bm-Hg; Sat, 08 Aug 2020 05:10:58 -0400 Received: by mail-pj1-x1043.google.com with SMTP id l60so2170076pjb.3; Sat, 08 Aug 2020 02:10:56 -0700 (PDT) Received: from localhost.localdomain (183178047145.ctinets.com. [183.178.47.145]) by smtp.gmail.com with ESMTPSA id i11sm13312700pjv.30.2020.08.08.02.10.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 02:10:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fWKpYnUfRg0gxuuuKT5iT/I7/Zv/OLd6oIWfqWvvQUg=; b=EBvSq0aVNEf5XTvrqLvnxFtrcJOkxncyp0RHzljQ8G+uaGTpPdIWGCns6+GUDbTLno OD8fLHkGLgjCLFGmD/T+W2s/xruF+hRkJjJ8ip4gT5NyccGI2N11mVshNrtVpHY+4oNm jJ8K2IkCYWV9UsbqprhAVTQuHRLPxljPoT6lTDh2gIUonII5aOJAJ8OSCMUPWcwyOpQA vP32DbpjANZ1+Z2M/2QEo7C6eXX4tJZCET/VJ9O8YgTW0KsRI0iZxGOHkiY0llXbqNxP MTcj456MPfNsqwlhBs1QcONepCsaeeFgHRWJ2FqnDmCMMXR862OyjsYXlCTDSfDK5qxN MiBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fWKpYnUfRg0gxuuuKT5iT/I7/Zv/OLd6oIWfqWvvQUg=; b=aOuGiRHjyWCpNRJB6kT/G+jCEbAL9fJTInWH7JEc7M7L4qO5yGbUk4WLFKS/WLwBdr JpykOXa7SBwAyYNcnbkrLmonRUDog4MiXXTOE94Np2Kj3STzrDWPllQ+wcYx3Pf3fyPw hjTODut6Md2UiIwUHVzS+UX2IrkvhXj3nCzzzmmyiDUJcAzIKpWli+iIHV60pfyB0mhU voaO+5gJ58ykM54831kjhF1WJTlgZh3cJWohD5jhV3uHEPSm0HLdD0QzPoRBnenu4v8X cBRlyeU14lFhHHrvckUi1gN7QUVrNXhpfhqE17w0BOaT3Qjx9Gv852g9L1FWIfHwvFR9 pLZA== X-Gm-Message-State: AOAM530i7HgHVCduWh1uim47T43XZIIgKhGHcvIIpVDVgkLb7YOlDDyn GiuzcWCG6gEfJ0A50XXbkNVZfGUIsWPZGQ== X-Google-Smtp-Source: ABdhPJylzfvKTv1USFPo4NvG63pys7FzBVwTk13/oLwbBLcLs5kYzzzRWR/CuQ0g76mOsJexEPq92Q== X-Received: by 2002:a17:902:ba83:: with SMTP id k3mr16155769pls.217.1596877855605; Sat, 08 Aug 2020 02:10:55 -0700 (PDT) From: Hongzheng-Li X-Google-Original-From: Hongzheng-Li To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 3/4] Add ePMP CSR accesses Date: Sat, 8 Aug 2020 17:09:49 +0800 Message-Id: <20200808090950.13-4-Ethan.Lee.QNL@gmail.com> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> References: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1043; envelope-from=ethan.lee.qnl@gmail.com; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 08 Aug 2020 08:59:47 -0400 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: Hou Weiying , sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, Hongzheng-Li , Alistair.Francis@wdc.com, palmer@dabbelt.com, Myriad-Dreamin 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" From: Hou Weiying Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin --- target/riscv/csr.c | 18 ++++++++++++++++++ target/riscv/pmp.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 11d184cd16..e2395e3a51 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -112,6 +112,11 @@ static int hmode(CPURISCVState *env, int csrno) return -1; } =20 +static int epmp(CPURISCVState *env, int csrno) +{ + return -!(env->priv =3D=3D PRV_M && riscv_feature(env, RISCV_FEATURE_E= PMP)); +} + static int pmp(CPURISCVState *env, int csrno) { return -!riscv_feature(env, RISCV_FEATURE_PMP); @@ -1160,6 +1165,18 @@ static int write_pmpaddr(CPURISCVState *env, int csr= no, target_ulong val) return 0; } =20 +static int read_mseccfg(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val =3D mseccfg_csr_read(env); + return 0; +} + +static int write_mseccfg(CPURISCVState *env, int csrno, target_ulong val) +{ + mseccfg_csr_write(env, val); + return 0; +} + #endif =20 /* @@ -1368,6 +1385,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = =3D { [CSR_MTINST] =3D { hmode, read_mtinst, write_mtins= t }, =20 /* Physical Memory Protection */ + [CSR_MSECCFG] =3D { epmp, read_mseccfg, write_msecc= fg }, [CSR_PMPCFG0 ... CSR_PMPADDR9] =3D { pmp, read_pmpcfg, write_pmpc= fg }, [CSR_PMPADDR0 ... CSR_PMPADDR15] =3D { pmp, read_pmpaddr, write_pmpa= ddr }, =20 diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 8df389cecd..0eabaf690c 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -490,3 +490,43 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint= 32_t addr_index) =20 return val; } + + +/* + * Handle a write to a mseccfg CSR + */ +void mseccfg_csr_write(CPURISCVState *env, target_ulong val) +{ + int i; + + if (!MSECCFG_RLB_ISSET(env)) { + for (i =3D 0; i < MAX_RISCV_PMPS; i++) { + if (pmp_is_locked(env, i)) { + /* + * Now that mseccfg.rlb is zero + * the value of mseccfg.rlb should be locked. + */ + val &=3D ~MSECCFG_RLB; + break; + } + } + } + + /* + * sticky bit + */ + val |=3D (env->mseccfg & (MSECCFG_MMWP | MSECCFG_MML)); + + env->mseccfg =3D val; + trace_mseccfg_csr_write(env->mhartid, val); +} + + +/* + * Handle a read from a mseccfg CSR + */ +target_ulong mseccfg_csr_read(CPURISCVState *env) +{ + trace_mseccfg_csr_read(env->mhartid, env->mseccfg); + return env->mseccfg; +} --=20 2.20.1 From nobody Tue May 21 07:25:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1596892147; cv=none; d=zohomail.com; s=zohoarc; b=i5mg4iGzYr5kM2pERn9LyEoHMva36vuNGfRrx55nbG/Xs17FZtpadtslKKC2MkpAPKl34uKk9WTrxY95UNmHQMAetNrR5J3NSDsFmvgATIgY9COkj/+rlIRdKIvbDO3gxn1QkekVTn09A2c6XEKZK4AiEXQRIbnIE5tWgcTcnAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596892147; 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=ZQ4wkJR7VVNblB+G2e/NZ21j2c8KfW3THWxKkfwdtAw=; b=DsmpcEUb0C4FdDhNeId/hPY78kgHW4OUz/O0vaiPgGylussvhJ3i5GB25DkwU9RcbDN9A6IayuGWpwkQTBk1FZxs3ttuwBellx9eOLbqshWlfKnLj/TsrWc+lxAU21BuYfJT8/jJrrJXnZKcsewDc5OrvCWEFNL3bhcGA6y/ORI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=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 1596892147630486.89148601030786; Sat, 8 Aug 2020 06:09:07 -0700 (PDT) Received: from localhost ([::1]:57020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4Oaw-0001do-4L for importer@patchew.org; Sat, 08 Aug 2020 09:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4KsY-0000l1-MB; Sat, 08 Aug 2020 05:11:02 -0400 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:40717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4KsW-0000c8-9P; Sat, 08 Aug 2020 05:11:02 -0400 Received: by mail-pj1-x1041.google.com with SMTP id d4so2231180pjx.5; Sat, 08 Aug 2020 02:10:59 -0700 (PDT) Received: from localhost.localdomain (183178047145.ctinets.com. [183.178.47.145]) by smtp.gmail.com with ESMTPSA id i11sm13312700pjv.30.2020.08.08.02.10.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 02:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZQ4wkJR7VVNblB+G2e/NZ21j2c8KfW3THWxKkfwdtAw=; b=PC9BPd3PwbPGf+qQvhYp2FBMAhVrZzjIIUTg5bMgguc2/uhGAgAv6VCgBGxiN/4tOq klGeJ/3ORPGbXWAmIQedOU6dssoTLg1QBRYdgQAIeZqNaW/ldbOSwOxQKnbcmGV+lryM xZ/ovI4vwff1qVIxh2BsUk7xZr3U2oxlgG0mUL40I/9Ro7ijyCqFLxxeORj/XnbCD+Jl z/Oem4f7ZKmWIGR/OQcw0TugSRdo65ImAHviAcyWMbu2orp/fdCRbQSfluKGYo77T9fJ L2QJwMDBozUZXw5c+08nIIQne7wXgDOM2SFJb/5RsgedQQxcj/zN6q3ezB7y9KxOXsRq sxOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZQ4wkJR7VVNblB+G2e/NZ21j2c8KfW3THWxKkfwdtAw=; b=WbiIsFfh2OwkSu5QGIQOb7XGfUdQAyt9mlwjKCSgjRhm/rl25Yh4bKnkvXO1N0AxBs uAtddNjU+cs8qNmUKeo1IO3aWGCMs1mGFGHFiZM7RkBH0jmbgWUjRsNfg9XXTNh178GU G2qvqIhLdn4p+/ev/X6fsXdtp7nipgmgxoPqltLQaMKU7YtvuGicRobU4W3wQ0dRIh81 FO65rOBXrA/nl7B5rJy3I6Yu3hD0R/GGyFT9ONkAMOc0iffNCpN4J1xngbIpHb2bp+9n ZzNcg8sfeLaCF83MHcGNdcMbiQ0MdJA/fFZ3S+SUj6S2oKPVHn6RgseA2EQML5Vfx5+P s0Mg== X-Gm-Message-State: AOAM530cucPbfSH6PPmB0VBbNXpUZYUr7y3UaYwffHUTTElUk/0rcajX seKOM1tiZNbPTK3W9fI6j91RMO4UIXtYYA== X-Google-Smtp-Source: ABdhPJzKHW2N9VyR2MzCX7L5LU5MliDKksICKxhZsiUiSUNdYvE0gZllyfxXWLq9jQpMdVGoDKogVw== X-Received: by 2002:a17:90b:124e:: with SMTP id gx14mr18033376pjb.225.1596877858527; Sat, 08 Aug 2020 02:10:58 -0700 (PDT) From: Hongzheng-Li X-Google-Original-From: Hongzheng-Li To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 4/4] Add a config option for ePMP. Date: Sat, 8 Aug 2020 17:09:50 +0800 Message-Id: <20200808090950.13-5-Ethan.Lee.QNL@gmail.com> X-Mailer: git-send-email 2.24.1.windows.2 In-Reply-To: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> References: <20200808090950.13-1-Ethan.Lee.QNL@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1041; envelope-from=ethan.lee.qnl@gmail.com; helo=mail-pj1-x1041.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 08 Aug 2020 08:59:47 -0400 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: Hou Weiying , sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, Hongzheng-Li , Alistair.Francis@wdc.com, palmer@dabbelt.com, Myriad-Dreamin 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" From: Hou Weiying Add a config option to enable experimental support for ePMP. This is disabled by default and can be enabled with 'x-epmp=3Dtrue'. Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin --- target/riscv/cpu.c | 9 +++++++++ target/riscv/cpu.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 059d71f2c7..79fa9d3c2f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -407,6 +407,14 @@ static void riscv_cpu_realize(DeviceState *dev, Error = **errp) =20 if (cpu->cfg.pmp) { set_feature(env, RISCV_FEATURE_PMP); + + /* + * Enhanced PMP should only be available + * on harts with PMP support + */ + if (cpu->cfg.epmp) { + set_feature(env, RISCV_FEATURE_EPMP); + } } =20 /* If misa isn't set (rv32 and rv64 machines) set it here */ @@ -509,6 +517,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), + DEFINE_PROP_BOOL("x-epmp", RISCVCPU, cfg.epmp, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index d0e7f5b9c5..afdc9fa2bf 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -77,6 +77,7 @@ enum { RISCV_FEATURE_MMU, RISCV_FEATURE_PMP, + RISCV_FEATURE_EPMP, RISCV_FEATURE_MISA }; =20 @@ -202,6 +203,7 @@ struct CPURISCVState { =20 /* physical memory protection */ pmp_table_t pmp_state; + target_ulong mseccfg; =20 /* machine specific rdtime callback */ uint64_t (*rdtime_fn)(void); @@ -272,6 +274,7 @@ typedef struct RISCVCPU { char *user_spec; bool mmu; bool pmp; + bool epmp; } cfg; } RISCVCPU; =20 --=20 2.20.1