From patchwork Fri Apr 2 12:47:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=lG/HzSA/; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg0d5LV9z9sV5 for ; Fri, 2 Apr 2021 23:51:29 +1100 (AEDT) Received: from localhost ([::1]:39504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJGp-0001ty-QB for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:51:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJFH-0001go-MK; Fri, 02 Apr 2021 08:49:51 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:62056) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJFF-000523-UW; Fri, 02 Apr 2021 08:49:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367805; x=1648903805; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tLRkE88V0qiEHhrz5ZgOJJoTbr4qtEL+x80XQoS99gs=; b=lG/HzSA/leWK9Jr9lSwh9kjZAiaEKAjep9rD9PQy3KryiExJXQyvtJFn qRnrl/o27yXqp+AbI/uabRhT2kKj+07bdJHZj4LdKaSpF/YZbDG7iFvhx lRlxZIU/c6L7SyCe78QDBxdoYjHF7XHdFyvtM9QjJzxBRle6am7EX6gDI ZMr7qgWC7hEHTWiuelPu9D2PkSfrRhjMQG/t79yRqMrpoY8JS97WLi2wn W5vGwX36qwmaKk8kdCk/JSG2m/ESTyUA6/bJaM/BSIbnHIZswve7s4iAf 6ObMGaxXdmRybLNpidRg0We/DEX+W/w42kQI4SfGBM2K0WYCNMZCHa+ZF g==; IronPort-SDR: QaJxch5x/T3zfbL+OntfD9gY4saKvKxltwjFPEeaWlXcLEHmVkq9GPUbiI7u9Dt7jVahDU+L1A FBd3AbrU73nrpCltK/VOvGF07bsFysjebNB5UI+snpQX9URZEvRb7JnmouS6xiliOou8s/L/kk TGvK9qpH+KPbM7fKPcoC30AfxwmfKy1BzGHMxkrXpqZ6LKtSploKqL4Y06uK5YZF7e1DfhVxwO Nbp1qjBfIDbtkd/mmptba36vf+S1d/GSx7Tm1E0XG2+pJ+CQ+VsGz3Ycvr6dEJSb9eGg8qlTvv 65s= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="268041744" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:49:36 +0800 IronPort-SDR: q6FTSXdWoSVusW9++OM+BzsBN9DdWnid8Z0XWvYj2c9qsGnAPWWM+Fc6wfGPVmutDx25BjRm9i u+BXPdT2crELGIY0d3iZYUX6sl77HHbRNt8WgwPSKN3ynAHeINkjZoDUPU4323pWIxfEujcmdH /4ipL4fNZBMtjE/DoRpatcvQIgD+e40DIQjr4oSkI5+6rW5vjC/i04R8lUGfD+bhmkoHA6w+FM lhrQ/iT10X6upsUdGzkTmZox7Y4RQGo32aCQ0vYeHH1kmXyV1fC4zwH1rNUWGQQbpvx/D37mIb TtWRLrHqRcpMT3p0rYJcXS/2 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; 02 Apr 2021 05:31:02 -0700 IronPort-SDR: apMdOsI0RZSZ7UC1BXFPGjoHED4l3/b0KfdZMFex5QSj5n8Iq9S7oIDBap0JWapWwJerCpOzRh gZ7mYbAMW7PFvwbGr5vNdXdjtboKBlTgt5dftvPeiTeYGTPnwo+GrOYU7ymWeJkoxbK0nDJKwe o4mCgKSo+yIQsdcDvrvIDXkLW0MT42tw3LfoPwmqgEXpgkHBbVoq72ne8jOuApwTOHNDm4/VfA lKzfMsWQkWvRKvJ7S1ssqfT+eRjA1w5yXKBmzKPS2aW89oln1R2+WyPqrJ2w3B36oP5PzzzRTH cPw= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2021 05:49:20 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 1/8] target/riscv: Fix the PMP is locked check when using TOR Date: Fri, 2 Apr 2021 08:47:25 -0400 Message-Id: <4123032daa32329ded1b4c7690dd0886d5ffe135.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.143.124; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa2.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The RISC-V spec says: if PMP entry i is locked and pmpicfg.A is set to TOR, writes to pmpaddri-1 are ignored. The current QEMU code ignores accesses to pmpaddri-1 and pmpcfgi-1 which is incorrect. Update the pmp_is_locked() function to not check the suppording fields and instaed enforce the lock functionality in the pmpaddr write operation. Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/pmp.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index cff020122a..6141d0f8f9 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -59,16 +59,6 @@ static inline int pmp_is_locked(CPURISCVState *env, uint32_t pmp_index) return 0; } - /* In TOR mode, need to check the lock bit of the next pmp - * (if there is a next) - */ - const uint8_t a_field = - pmp_get_a_field(env->pmp_state.pmp[pmp_index + 1].cfg_reg); - if ((env->pmp_state.pmp[pmp_index + 1u].cfg_reg & PMP_LOCK) && - (PMP_AMATCH_TOR == a_field)) { - return 1; - } - return 0; } @@ -380,7 +370,22 @@ void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, target_ulong val) { trace_pmpaddr_csr_write(env->mhartid, addr_index, val); + if (addr_index < MAX_RISCV_PMPS) { + /* In TOR mode, need to check the lock bit of the next pmp + * (if there is a next). + */ + if (addr_index + 1 < MAX_RISCV_PMPS) { + uint8_t pmp_cfg = env->pmp_state.pmp[addr_index + 1].cfg_reg; + + if (pmp_cfg & PMP_LOCK && + PMP_AMATCH_TOR == pmp_get_a_field(pmp_cfg)) { + qemu_log_mask(LOG_GUEST_ERROR, + "ignoring pmpaddr write - pmpcfg + 1 locked\n"); + return; + } + } + if (!pmp_is_locked(env, addr_index)) { env->pmp_state.pmp[addr_index].addr_reg = val; pmp_update_rule(env, addr_index); From patchwork Fri Apr 2 12:47:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=Ue4ph3oJ; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBfyt21V2z9sV5 for ; Fri, 2 Apr 2021 23:49:58 +1100 (AEDT) Received: from localhost ([::1]:38036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJFM-0001Gg-9l for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:49:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJF0-0001E1-UW; Fri, 02 Apr 2021 08:49:34 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:50879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJEz-0004o8-8t; Fri, 02 Apr 2021 08:49:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367772; x=1648903772; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eCjdyiPAUhjBSzt373ttYpvN5BRMF04/VE5UxbyuPKc=; b=Ue4ph3oJlgjWr1eSPE2kPSqwGg4WJCv+b9g8nascCsv3oiOdbjjCDBUW dgw2A7rbvBbnTrDG+LFR8v2i4JSfN9sySSj2fiOhbUg8lx2UY0WYMwDcY 5WBEQ9vycy432giKyy7bcWSLvMCXD3O7JGcyFmKHAEIh2g5TU5tLTvBMh Zw1NQ33OqKyfs5DQrN4LRqqSwklgbepTXEdFGu0PIoLCjgJgPBzzWfhnH RJSdFhL9QFHPRottf3F293nqtkCO6nN4BorhG0PncPjeK6fWMk7NXIAVa Ai5amuAFkM74JIj+M/iVPwRfeaiKsRw1hBQPQVwKGVhqtrq7B/plL6H8R A==; IronPort-SDR: GHzlkI7UkI0Xe88BuB2VSO8RPLnjIGwLZ3VASS0RUCP0Mqz7kJGwOdRHSZOTddQzm5y+0LDc2m ERVIzsrl84OV36Mh7K+0JngGbv1+GvXcn66E2aSHUhsi+15R4tO0nYJETJU6A6tkdLtucbkoJQ 1Nte0I/a9hKamDX4dJ+icu+6fF4CKF4p40xRkJE3TUn8p/qjCJAmdYKeDq6cEItCMnjtE8ER+o pSf0eibGGQsK4dBRH3lyw1JZ3cF8qzffofilA9zoCBrdJXkmBTtSyuyN3/0eK4W0SuJtEoiywW Vnc= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="163663482" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:49:31 +0800 IronPort-SDR: c6Iq/LkIE6rbaq0sQoJvgQNrKEny9JhbSPhaHtZhxgJOgrxcUlrXx8pjwfMSHqp39fd7QUGhLV lZ/SfNaOCKfYysSATg9iotL1ALHk4FWG9o8vxjmv08jVgu5ldT08kGY1klGEhjGx0Bmz4AjRSv zIQOG79eqX19xa96Lt3LOTNAtsZA4ShOw4bUZZQ7+5SPLk3koDIAxJHJk+jL3X6aknA37F0A4q Ft/DwWjTr2o2OFcmnqDQbFjW4C9mUniowgGBOmonBIC88usVR4msQDjxt1bF2OQtd+2swwcDSN m7MLDjwUIn7u69uYscSczyW8 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; 02 Apr 2021 05:29:37 -0700 IronPort-SDR: aO7GtY22+jhAz1J80PpMYJaS3rqMYT66HNnEidVqyd3HT/2Il6+qsvwQ6x1BTf8yvBMOhHDdgH derZlQTbsb4ucEGDp/I53ZvamPxbISfBpEfj96DMsInTb1hyZCJj4+XaGGz5KY+jYWVo4bPmYy tdzwXP6R8CoPsvhMmbsDIKdpSTCn38JBb7OJub5dxtIZm6NAUxltXivrvtuk7GRzcsXTfP62KJ 1MpeHXUli2BvnwLEiJdg7LfMTTN4zv0+eARmp1CuvmSUX4EQaA+86yxr8nGhk/J6cH4AoGiGh7 3BA= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2021 05:49:30 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 2/8] target/riscv: Define ePMP mseccfg Date: Fri, 2 Apr 2021 08:47:35 -0400 Message-Id: <5bf4e802b52fc4f8e57c8c03346cec716ea3ce32.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.153.144; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa5.hgst.iphmx.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Hou Weiying Use address 0x390 and 0x391 for the ePMP CSRs. Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin Reviewed-by: Alistair Francis Message-Id: [ Changes by AF: - Tidy up commit message ] Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/cpu_bits.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index caf4599207..32e1ee92dc 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -232,6 +232,9 @@ #define CSR_MTINST 0x34a #define CSR_MTVAL2 0x34b +/* Enhanced PMP */ +#define CSR_MSECCFG 0x390 +#define CSR_MSECCFGH 0x391 /* Physical Memory Protection */ #define CSR_PMPCFG0 0x3a0 #define CSR_PMPCFG1 0x3a1 From patchwork Fri Apr 2 12:47:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=qkQk60FE; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg2N6xktz9sVq for ; Fri, 2 Apr 2021 23:53:00 +1100 (AEDT) Received: from localhost ([::1]:44778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJII-0004JJ-VT for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:52:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJF9-0001UA-Ro; Fri, 02 Apr 2021 08:49:43 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:3524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJF8-0004wX-9N; Fri, 02 Apr 2021 08:49:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367782; x=1648903782; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=arIzgXLNsXFV59LBlt/qPi792+nckdmzeESZkM5VfiY=; b=qkQk60FEDZhJtNJn6tfbvC4lzF86vdFcJSOgoVHwZBXlSFTRz2WIuZ/X E1/dCR9WWJDV2eomYtBu+eX5TcwOPv1dZe1dpWwm2aU5msrFctwiDfZcH yIDHXL7YoYbRy2vWz/Q0LanQ4hgRZjX6YppxVxrzE3YBq+WNE9QXqQgwj UwxaiNdtA21yczqHJoreK2zK7/Bmm6eY2RTkLLA9jD2y+89+Exx/jDSoj hUXcGYbaSNwaNAJqQ2lPNuB1Lf93pSDz+gmHfXwE3JcujcUKG60GTRUvZ xWJhvLBizFWg8QF2pK0i1BJJDOIXWqzf5goUa9f55aeDgWmNitxYhOSpi g==; IronPort-SDR: tYhLX2IsRRhaMJ+IYYoee9fWe9pYyZxsr9cRCERU1XnZyftMdf+7PuBXTaz0oSzlWAXWGfZFtI 7Ktv2ZgJOQJHEXoK0p/i7NK2j8z5f725YYzAuySKoHZLHTZ83CUBzIxd87Ew4+g3OQml4riD9t LInSDZMtlYNClLMJz5Y9C+tVbQ9CW46nAIp8OCEB3J8r22vcFbICIBBwtEsILmh9/8DMZkeXoD +atG/+1BrTcw3DTHF21uA3aD/lWFnL78I6Jv6gTLtYbIz/m2sNizdPEyEDkizAopbYRml+GpQO vsI= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="274495124" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:49:40 +0800 IronPort-SDR: D+oN6uVdXT3wQc/xRHSFls6Qhk6doZE6sejbRlltMXesVa7mJPa/Z7izPYR8adMJKn5pJm01Lf X5AMnyc4oo/1eijWvqBQBj7o3Di3xQtIZQ7XGDaX601t1sBk1op9qiJ1ZTqf7Ym6MU2xITyr/P WXgNRrAEkCaR36aoOPr6qcNTGzo/2oa8BeypMAtdfdxtDrmBMIw67Wr3b10NGElMOr56HFtnEC YyQYMMhfIJTfab4VS+mM1UMm5sPJ44XR9zAnZZWER+hsDxKZyuQRoNcx/QyvV+Kfgk9SJsgmfq VDCmcwTV//6z6KQmFOBKlIpS 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; 02 Apr 2021 05:31:21 -0700 IronPort-SDR: /xSwc9H9Db0x4bH4+Ic9VC5yEf8Ge9Y+uU3fvedVbMaqmtfUiZ13Mhs5wiPpMdmX9BHdY+T25+ 5jt2fDP4BojQtzEEptz4i8NmxMQxDROz6UtdtqHntgHjHMOkylcQvcLd1PVsC1qafZmoRLtM0I BvEFvVEm2Ik7tnzc7IMzaxmhGlWv6kwEWv9jLhgXk9zy7+aZtvEAk/DYgxq0HIGt9D5JVMiZAf EAYsdId0KqnVaoYDCKySpvCgqvwuborWFo2oCckPlNb0xWJX7V+aQ0YcaXp6tVpqTAk5XzrnQm 4UY= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2021 05:49:39 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 3/8] target/riscv: Add the ePMP feature Date: Fri, 2 Apr 2021 08:47:44 -0400 Message-Id: <5c59f6a40a5bdff35c086f35665e97de5b872c64.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.141.245; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa1.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 0a33d387ba..8dcb4a4bb2 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -80,6 +80,7 @@ enum { RISCV_FEATURE_MMU, RISCV_FEATURE_PMP, + RISCV_FEATURE_EPMP, RISCV_FEATURE_MISA }; From patchwork Fri Apr 2 12:47:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=QeJ2E6dV; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg3l2RlHz9sWQ for ; Fri, 2 Apr 2021 23:54:11 +1100 (AEDT) Received: from localhost ([::1]:47708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJJR-0005aF-8K for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJFK-0001lZ-4U; Fri, 02 Apr 2021 08:49:54 -0400 Received: from esa3.hgst.iphmx.com ([216.71.153.141]:16343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJFI-00053s-2e; Fri, 02 Apr 2021 08:49:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367791; x=1648903791; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A+wseZDURJVSzIR6lUEeiXg3gJfOcckqpChsZv47mEk=; b=QeJ2E6dVQndogGAfRFOQJ5XEIewtBnZLRaTZBS/DbCcPyfDyByuscfmc vv47UtCaXl2plAe3tYLBt34XDRYNnu4jMZdI68VpAIlT3OZQkjHq06xCo zrXCFsRwRR+TxnPJnBZK/SZZKIHeadoTfzQ6SKeGQe73YultK47VMQbkm qgKQyF6RAcVeEmPBAz64HPGzvYquwIzItJCJuNMJL75pemVaGISddbPlr 9DLmVEARYat/DaqGz3acH6l3HAdCaZ+QlKIcUc6IK4xbPFjfFi5ra3933 h6/q09bsDeGUyBQSVeAIvmD9Ixzy21blGhRh67C7yUO96T6MDrJXPqlCQ Q==; IronPort-SDR: VPj9NQ1X57Kkk8DGsfSMzNnz12I4R8hqa06hFOmeFa2SIFzEjRzCMZSxyyFygMAEukiN560830 3FquSdcDELXxbe3ycXBT9B9fEX6gs6lxUH3gUCU2buz0vO2vpqQzrSwRD2GlBBU/Gvdi4k9IlG uqBrbhMKssZMVzdZGg3fFRax1OPtt/ZVUtIqUcvGXLKOLtiE3Hkc6yhfThSdXmQb+KRjnISA/W 7IXBVYSPFtENY9PzlNxDZHHDbwBf9KldBcU1t7OybjFIrkJ3Dq/NT5wtrrwyqIjVt76i+NetGT heQ= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="168145519" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:49:49 +0800 IronPort-SDR: gcrgkRalH9fB25Y8Bhcz7kAPUZL92RdFA4C9/TgQa4eVwOQxvfP4PW7oXsLj4A1m+xXEySWGmr UO3N24sRWKhwDwxQ2+i6B3OQelwbdKhnQhzoXZdsRtu2jQFtRlA2RZYgKxGtWyvHTERc7RQxOF MrbwQoM3QuHB2ObyovRo3McBeOXWlt9WCWAigmyuwNoOWWdalsKx9kzpZ45FNE3f709TvIYYgD rXsgoPEQDJBSR96RrXPHnZ+En96R7ydzvLmMEq9FeNDg91W5zM5moNTikDIOqxo+xoFjNKzKTn wpgME90nghUUBi7IIBhCuZvE 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; 02 Apr 2021 05:29:56 -0700 IronPort-SDR: eawTswFymWqpC/cacleW9y9I0USzUjZXZOT+oAsd9HkUg2eq7OAI1bvI8LqkD0yB0zRVv2NeV5 7A+YMq8pGKnmQrSYTRoOSqSB0gLqUJCd+kiNjYiSmLhuDTnYGfsl7wZj0Nd65iPhQAq6/04xD4 NHL7AazNzvi65/p9Hoot19EK+NiSryaYr/Ga0mSXPkO24nxnlgnOAh0T/4GTNkXxPqg9xVf758 tqiPkWZjRoFLyA635ilpr37xrULP+1F3hx8D8HGffzFbbaXmtz91tmkOMMqIr3YzDjnuq9UktH 35c= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2021 05:49:49 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 4/8] target/riscv: Add ePMP CSR access functions Date: Fri, 2 Apr 2021 08:47:54 -0400 Message-Id: <8c6c6c2e9feb7709b5d23eee57d96e322ac8e5a7.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.153.141; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa3.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Hou Weiying Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin Message-Id: [ Changes by AF: - Rebase on master - Fix build errors - Fix some style issues ] Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/cpu.h | 1 + target/riscv/pmp.h | 14 ++++++++++++++ target/riscv/csr.c | 22 ++++++++++++++++++++++ target/riscv/pmp.c | 34 ++++++++++++++++++++++++++++++++++ target/riscv/trace-events | 3 +++ 5 files changed, 74 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 8dcb4a4bb2..d1198c0d0d 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -231,6 +231,7 @@ struct CPURISCVState { /* physical memory protection */ pmp_table_t pmp_state; + target_ulong mseccfg; /* machine specific rdtime callback */ uint64_t (*rdtime_fn)(uint32_t); diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h index b82a30f0d5..a9a0b363a7 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; +typedef enum { + MSECCFG_MML = 1 << 0, + MSECCFG_MMWP = 1 << 1, + MSECCFG_RLB = 1 << 2 +} mseccfg_field_t; + typedef struct { target_ulong addr_reg; uint8_t cfg_reg; @@ -55,6 +61,10 @@ typedef struct { void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, target_ulong val); target_ulong pmpcfg_csr_read(CPURISCVState *env, uint32_t reg_index); + +void mseccfg_csr_write(CPURISCVState *env, target_ulong val); +target_ulong mseccfg_csr_read(CPURISCVState *env); + void pmpaddr_csr_write(CPURISCVState *env, uint32_t addr_index, target_ulong val); target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index); @@ -68,4 +78,8 @@ void pmp_update_rule_nums(CPURISCVState *env); uint32_t pmp_get_num_rules(CPURISCVState *env); int pmp_priv_to_page_prot(pmp_priv_t pmp_priv); +#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/csr.c b/target/riscv/csr.c index d2585395bf..78b7fb8040 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -184,6 +184,15 @@ static int hmode32(CPURISCVState *env, int csrno) } +static int epmp(CPURISCVState *env, int csrno) +{ + if (env->priv == PRV_M && riscv_feature(env, RISCV_FEATURE_EPMP)) { + return 0; + } + + return -RISCV_EXCP_ILLEGAL_INST; +} + static int pmp(CPURISCVState *env, int csrno) { return -!riscv_feature(env, RISCV_FEATURE_PMP); @@ -1239,6 +1248,18 @@ static int write_mtinst(CPURISCVState *env, int csrno, target_ulong val) } /* Physical Memory Protection */ +static int read_mseccfg(CPURISCVState *env, int csrno, target_ulong *val) +{ + *val = mseccfg_csr_read(env); + return 0; +} + +static int write_mseccfg(CPURISCVState *env, int csrno, target_ulong val) +{ + mseccfg_csr_write(env, val); + return 0; +} + static int read_pmpcfg(CPURISCVState *env, int csrno, target_ulong *val) { *val = pmpcfg_csr_read(env, csrno - CSR_PMPCFG0); @@ -1473,6 +1494,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MTINST] = { "mtinst", hmode, read_mtinst, write_mtinst }, /* Physical Memory Protection */ + [CSR_MSECCFG] = { "mseccfg", epmp, read_mseccfg, write_mseccfg }, [CSR_PMPCFG0] = { "pmpcfg0", pmp, read_pmpcfg, write_pmpcfg }, [CSR_PMPCFG1] = { "pmpcfg1", pmp, read_pmpcfg, write_pmpcfg }, [CSR_PMPCFG2] = { "pmpcfg2", pmp, read_pmpcfg, write_pmpcfg }, diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 6141d0f8f9..1d071b044b 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -418,6 +418,40 @@ target_ulong pmpaddr_csr_read(CPURISCVState *env, uint32_t addr_index) return val; } +/* + * Handle a write to a mseccfg CSR + */ +void mseccfg_csr_write(CPURISCVState *env, target_ulong val) +{ + int i; + + trace_mseccfg_csr_write(env->mhartid, val); + + /* RLB cannot be enabled if it's already 0 and if any regions are locked */ + if (!MSECCFG_RLB_ISSET(env)) { + for (i = 0; i < MAX_RISCV_PMPS; i++) { + if (pmp_is_locked(env, i)) { + val &= ~MSECCFG_RLB; + break; + } + } + } + + /* Sticky bits */ + val |= (env->mseccfg & (MSECCFG_MMWP | MSECCFG_MML)); + + env->mseccfg = 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; +} + /* * Calculate the TLB size if the start address or the end address of * PMP entry is presented in thie TLB page. diff --git a/target/riscv/trace-events b/target/riscv/trace-events index b7e371ee97..49ec4d3b7d 100644 --- a/target/riscv/trace-events +++ b/target/riscv/trace-events @@ -6,3 +6,6 @@ pmpcfg_csr_read(uint64_t mhartid, uint32_t reg_index, uint64_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) "hart %" PRIu64 ": read addr%" PRIu32", val: 0x%" PRIx64 pmpaddr_csr_write(uint64_t mhartid, uint32_t addr_index, uint64_t val) "hart %" PRIu64 ": write addr%" PRIu32", val: 0x%" PRIx64 + +mseccfg_csr_read(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": read mseccfg, val: 0x%" PRIx64 +mseccfg_csr_write(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": write mseccfg, val: 0x%" PRIx64 From patchwork Fri Apr 2 12:48:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=pI9Czkjq; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg6r05Vhz9sVq for ; Fri, 2 Apr 2021 23:56:51 +1100 (AEDT) Received: from localhost ([::1]:54652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJM0-0000Sb-Qv for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:56:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJG2-0002JJ-QF; Fri, 02 Apr 2021 08:50:38 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:33102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJFu-0005a6-Bc; Fri, 02 Apr 2021 08:50:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367839; x=1648903839; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SGBlToQIFFA12BHA6GfAhniVjk+2Iyuqo04eEx47gsg=; b=pI9CzkjqjbwNHThLvJsvTYEvmgzZ2tTxDstFXR3+rIhxGgimcygf3jsM hIrcbqwnvPUJsjo08Ohy5ymuHt7nHamAVA4nvazJvUZC+5IbMFrhzzaUW v6iPKt6YGyGGEJt1yWrH2zc294R517RzTD200cfjGTZR3CKvfwlJT4LZ8 5HnYfvesMCDGpkg4GphB1ecbiq0u8sr4UqbK3l52tQoqAvV5rC5f09oDS 2aY4sHPRDKzFKGBisPo/GLkYemzpFpHuK8yTSrWfjlwXIB8AzKV626aa3 j5p0sF9B+ODvUFM3QcvvkSnz5j/rRQ4monVbeDjC141LJdYnhSJhtHq83 w==; IronPort-SDR: FNJYnTSYRoZJsdThUm8l4rSWCpNIgHz3SP4hUahfNwGRn56Bpfm63fygdfzJ/nbjAi12uKuTg3 1q+M0Yio4DVPccVbT9ubQAjRfRw/rOSWO+EvfpLdnaGMea7dk9oT8grAM2HRPwEodWeXndysPM J/RvnswHzj/xckTE0GuyhTPKS5XKn2TiV8eMalEgcaPRBX5U+WZ1Mj6t1i1U7ATkoT3HPcyNZa Nc4LsNcxXBOodFN01obIOgXe7j1PEs6kMOIZLFO2/JaOjkwLxSfrlaibKTThxRM5mapvLHfGC8 dIY= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="268041773" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:50:07 +0800 IronPort-SDR: ZRRx+EZaNk19/GRFEjxIRLUTSNlo7JZRIBvDfvSo6B20g9aDHAjELJ53PJUqL6mYJulC2G/9zb VWaX0hkPnzR39Z6wVHDTiu0untDMYRC12OlMsY7uXl4h+TDSKEIBd5QypshseDbLys8BqkRUmx PYlw/E1780SmADw5y5EqsVhU7R9cL+p0k9deiTRynis8uJGkMJ6WYNZAvR+i1Zqwch5i2HbByR JtWOXB7fcTGc7D1LnyntvUAbhJ6FNvw0SvzIzKM4HPuT/DqamNdQPzwRB/MEwLDR7Aj8XRO3fO USsPfbS1W4boIi86bnvlBqkN 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; 02 Apr 2021 05:31:40 -0700 IronPort-SDR: d5CmH5xZa/iXAWxtLJPG+SwEkOV5G7QZf3I9iPUHbgW9iKQ7lf0qRYDInmNxzyKyT8xMsttWxA 0CZEBNS7M+5OfnHtw+DWdskijurNlX5O9JQfmNB/+LRzYcyoB03UcZqf6uUzf/7ZvQDamx9ete vLmbynQsEqs3uzQeN6S/4l8rktH3rO9a0hOfHWr09mdxwLGLRl0kG/3UpdLR+3/UDqHlY7cU5q F6AbMP+ChBFT+eIshjQ6fwTm4mIB6VT8we3SRSEslxO2cglQdR0aJK+A5nrVsKs3XXstxKp10d WSU= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2021 05:49:58 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 5/8] target/riscv: Implementation of enhanced PMP (ePMP) Date: Fri, 2 Apr 2021 08:48:03 -0400 Message-Id: <3d2dbabe5d5e25c1c88b9fda0bbdd5f154b2993e.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.143.124; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa2.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Hou Weiying This commit adds support for ePMP v0.9.1. The ePMP spec can be found in: https://docs.google.com/document/d/1Mh_aiHYxemL0umN3GTTw8vsbmzHZ_nxZXgjgOUzbvc8 Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin Message-Id: [ Changes by AF: - Rebase on master - Update to latest spec - Use a switch case to handle ePMP MML permissions - Fix a few bugs ] Signed-off-by: Alistair Francis --- target/riscv/pmp.c | 165 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 153 insertions(+), 12 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 1d071b044b..3794c808e8 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -90,11 +90,42 @@ 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)) { - env->pmp_state.pmp[pmp_index].cfg_reg = val; - pmp_update_rule(env, pmp_index); + bool locked = true; + + if (riscv_feature(env, RISCV_FEATURE_EPMP)) { + /* mseccfg.RLB is set */ + if (MSECCFG_RLB_ISSET(env)) { + locked = false; + } + + /* mseccfg.MML is not set */ + if (!MSECCFG_MML_ISSET(env) && !pmp_is_locked(env, pmp_index)) { + locked = false; + } + + /* mseccfg.MML is set */ + if (MSECCFG_MML_ISSET(env)) { + /* not adding execute bit */ + if ((val & PMP_LOCK) != 0 && (val & PMP_EXEC) != PMP_EXEC) { + locked = false; + } + /* shared region and not adding X bit*/ + if ((val & PMP_LOCK) != PMP_LOCK && + (val & 0x7) != (PMP_WRITE | PMP_EXEC)) { + locked = false; + } + } } else { + if (!pmp_is_locked(env, pmp_index)) { + locked = false; + } + } + + if (locked) { qemu_log_mask(LOG_GUEST_ERROR, "ignoring pmpcfg write - locked\n"); + } else { + env->pmp_state.pmp[pmp_index].cfg_reg = val; + pmp_update_rule(env, pmp_index); } } else { qemu_log_mask(LOG_GUEST_ERROR, @@ -217,6 +248,33 @@ static bool pmp_hart_has_privs_default(CPURISCVState *env, target_ulong addr, { bool ret; + if (riscv_feature(env, RISCV_FEATURE_EPMP)) { + if (MSECCFG_MMWP_ISSET(env)) { + /* + * The Machine Mode Whitelist Policy (mseccfg.MMWP) is set + * so we default to deny all, even for M mode. + */ + *allowed_privs = 0; + return false; + } else if (MSECCFG_MML_ISSET(env)) { + /* + * The Machine Mode Lockdown (mseccfg.MML) bit is set + * so we can only execute code in M mode with an applicable + * rule. + * Other modes are disabled. + */ + if (mode == PRV_M && !(privs & PMP_EXEC)) { + ret = true; + *allowed_privs = PMP_READ | PMP_WRITE; + } else { + ret = false; + *allowed_privs = 0; + } + + return ret; + } + } + if ((!riscv_feature(env, RISCV_FEATURE_PMP)) || (mode == PRV_M)) { /* * Privileged spec v1.10 states if HW doesn't implement any PMP entry @@ -294,13 +352,94 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr, pmp_get_a_field(env->pmp_state.pmp[i].cfg_reg); /* - * If the PMP entry is not off and the address is in range, do the priv - * check + * Convert the PMP permissions to match the truth table in the + * ePMP spec. */ + const uint8_t epmp_operation = + ((env->pmp_state.pmp[i].cfg_reg & PMP_LOCK) >> 4) | + ((env->pmp_state.pmp[i].cfg_reg & PMP_READ) << 2) | + (env->pmp_state.pmp[i].cfg_reg & PMP_WRITE) | + ((env->pmp_state.pmp[i].cfg_reg & PMP_EXEC) >> 2); + if (((s + e) == 2) && (PMP_AMATCH_OFF != a_field)) { - *allowed_privs = PMP_READ | PMP_WRITE | PMP_EXEC; - if ((mode != PRV_M) || pmp_is_locked(env, i)) { - *allowed_privs &= 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 + * This will always apply to regular PMP. + */ + *allowed_privs = PMP_READ | PMP_WRITE | PMP_EXEC; + if ((mode != PRV_M) || pmp_is_locked(env, i)) { + *allowed_privs &= env->pmp_state.pmp[i].cfg_reg; + } + } else { + /* + * If mseccfg.MML Bit set, do the enhanced pmp priv check + */ + if (mode == PRV_M) { + switch (epmp_operation) { + case 0: + case 1: + case 4: + case 5: + case 6: + case 7: + case 8: + *allowed_privs = 0; + break; + case 2: + case 3: + case 14: + *allowed_privs = PMP_READ | PMP_WRITE; + break; + case 9: + case 10: + *allowed_privs = PMP_EXEC; + break; + case 11: + case 13: + *allowed_privs = PMP_READ | PMP_EXEC; + break; + case 12: + case 15: + *allowed_privs = PMP_READ; + break; + } + } else { + switch (epmp_operation) { + case 0: + case 8: + case 9: + case 12: + case 13: + case 14: + *allowed_privs = 0; + break; + case 1: + case 10: + case 11: + *allowed_privs = PMP_EXEC; + break; + case 2: + case 4: + case 15: + *allowed_privs = PMP_READ; + break; + case 3: + case 6: + *allowed_privs = PMP_READ | PMP_WRITE; + break; + case 5: + *allowed_privs = PMP_READ | PMP_EXEC; + break; + case 7: + *allowed_privs = PMP_READ | PMP_WRITE | PMP_EXEC; + break; + } + } } ret = ((privs & *allowed_privs) == privs); @@ -328,10 +467,12 @@ void pmpcfg_csr_write(CPURISCVState *env, uint32_t reg_index, trace_pmpcfg_csr_write(env->mhartid, reg_index, val); - if ((reg_index & 1) && (sizeof(target_ulong) == 8)) { - qemu_log_mask(LOG_GUEST_ERROR, - "ignoring pmpcfg write - incorrect address\n"); - return; + if (!riscv_feature(env, RISCV_FEATURE_EPMP) || !MSECCFG_RLB_ISSET(env)) { + if ((reg_index & 1) && (sizeof(target_ulong) == 8)) { + qemu_log_mask(LOG_GUEST_ERROR, + "ignoring pmpcfg write - incorrect address\n"); + return; + } } for (i = 0; i < sizeof(target_ulong); i++) { From patchwork Fri Apr 2 12:48:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=KBBmV1lU; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg2Y48Rrz9sWF for ; Fri, 2 Apr 2021 23:53:09 +1100 (AEDT) Received: from localhost ([::1]:45640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJIR-0004fR-KB for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJG6-0002LL-VF; Fri, 02 Apr 2021 08:50:44 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:17431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJFu-0005a9-IJ; Fri, 02 Apr 2021 08:50:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367830; x=1648903830; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wudO3Lv+mtFD1GAc1BX9Z+PCB+LHagjqO9xemJTHsyI=; b=KBBmV1lUSuii4lSrzNrPSkwG2giyTfZZosmDuK3xCfye+y3dZHRdlIwo 89DBJOM51+IXDkxN/eGXyn/n3/dO54+a/i35JqbtIbqGSOwEpW2DfNg80 Oj3KoPfeCbTRqxMoYuHu0Rn3M1eQPyEmBIfNchZLbjkEsVwniUDzKhrUi wuHLRhFUF/WLhp8DoXtxKcIS9fhpBfT2Xb83X5niqtWAd0TMFQOXenxTw /RmtYb4RxCpnH2Fy1PbpI4Xw0BJwsleWwQheVILC2e0MiPDsNCJEKvH/v ky3K/+z30p+6eAzFFHfozs18PV2/T8cwTdWHN9UItHp5UriU4e0iAnzJs Q==; IronPort-SDR: zcknax85aI+VVThFpRkr6PHW9I7MOP3+TmWRcf+u+Zm2f/2FSGbhtEQN22tq93UCPr4cWHIgkx Br4ijf0c721gISuuWE707ZVzbo/dw9AmvIacy6erVz9wtFDZdaootLrDGNsTnYyIKix+Mcqw0Q JMb78hlTe+HUNkbnzxCFQV4ot9yGyplDcolWyl4iTf+fpKQgOx0Qmz1Ez8CGUv/dD+qgPUrEB9 gssrRoG511wpllSREc/7//ZAbEDlJxdaR0gCOIgyFM2ttImzctKZduql58a9cqgQ9YOWrKUpmp 6v8= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="163523932" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:50:15 +0800 IronPort-SDR: t1uVQizh4CjzIldL8zIAAcTGZ1INWdaos+LP5BOgDuKHqm/wsPD0d2amNMdYCn5bsyjdiyK/2N yrNoURxAnaeuNRjdNgBrTm4WKYrfnrBAM8pb7u/9WRXuTQ9Wy12/1Zqm5OozgyxoU3Hl7QSaAs QRKsYYhOaQ35kO+L8Daejjtm8SV2AAWE05wTByki4sAbxUw+oiaDO9qpEwMsNqnHfYs6/YEOuq jgp1LYwjgO+RGGKxuSjvmN3jeVFAws/m0qvaNFeKIDhq7WXnii9ho2TbEp5+OtzgUfM1wWQG99 yhrT3qPD87UL1AQrYKkPqZah Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2021 05:31:49 -0700 IronPort-SDR: H+93N4RLX9sN6AzZ+JIphxh/gCT6WdG2raCV6Hxcuim08Qkj9kiRANi7vFHohqvE0WB5zj4q25 2oP1/rv9l3YH0Nd7SRVekgeMZk0lAuaIBk/CUFeX1tKedFYkqhmwBkzhSXCSTXRT34a1OQk/X7 T7szWXGkNedtv/6feAghge4udQ5NiaZbExWl/bUGLRdYV5a9X1kwaQOxTtHccexxkJKnYKcC8a lh/p1vzLozoKECQYgmEDyzr3wtKTvm/pv0D8INh/k6txhzT0FQks+2Nc6CEWXDAuHaaQY2aDS2 zUE= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip01.wdc.com with ESMTP; 02 Apr 2021 05:50:08 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 6/8] target/riscv: Add a config option for ePMP Date: Fri, 2 Apr 2021 08:48:13 -0400 Message-Id: <89188d4b3d72aa1dbcd696c6489a39d84ef8cd2e.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa4.hgst.iphmx.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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=true'. Signed-off-by: Hongzheng-Li Signed-off-by: Hou Weiying Signed-off-by: Myriad-Dreamin Message-Id: Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/cpu.h | 1 + target/riscv/cpu.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index d1198c0d0d..22df0d8206 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -305,6 +305,7 @@ struct RISCVCPU { uint16_t elen; bool mmu; bool pmp; + bool epmp; uint64_t resetvec; } cfg; }; diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 7d6ed80f6b..d665681f90 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -412,6 +412,14 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) 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); + } } set_resetvec(env, cpu->cfg.resetvec); @@ -554,6 +562,8 @@ static Property riscv_cpu_properties[] = { DEFINE_PROP_UINT16("elen", RISCVCPU, cfg.elen, 64), 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_UINT64("resetvec", RISCVCPU, cfg.resetvec, DEFAULT_RSTVEC), DEFINE_PROP_END_OF_LIST(), }; From patchwork Fri Apr 2 12:48:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=WdKw+3u+; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg101qXVz9sVq for ; Fri, 2 Apr 2021 23:51:48 +1100 (AEDT) Received: from localhost ([::1]:40818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJH8-0002Ty-8O for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJGE-0002QU-GH; Fri, 02 Apr 2021 08:50:50 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:33135) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJGB-0005gX-Ci; Fri, 02 Apr 2021 08:50:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367865; x=1648903865; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YCFwsLkhn73qXcaqDziKc5FX9Jy5pjFqa42LuCKRq+U=; b=WdKw+3u+69QHZF4lJGCAjNR7myBUrNnW3Ny01h0RbFC4ai5Nta1kQ9ir gdjeXA1b0Vkgs8GFL9HeKIcuXYDwkTHKjgU/fudPlLE566gBq5JmFikv4 SJVxHxmrXiAxtyBfU5aA+B0F0W9beJKVx61Q6750agF7b6FLpGgpqpQfZ EO0E0TFPb9xvVJEIfbbjy9LpdulBubtno31WGA7UZGxfb51Rq3E6RjB/s xR8/evxkbrmzyTzQ0ES1OvFgnuchi5tFDvbF4t3wUdneVkLOlwMa/xhV0 P+niVvzlIlNP4Uyd8m+SgK+3pegPw8q00JmIz6btkhXYEMQuZtOnfRDQ2 A==; IronPort-SDR: WQ872OStzTdG9NgFnBjpN93BXvKhz99bZzfIkk9nTcu0dtF0c7pesNUNowjuAN52MdCrr+cP3m qQDzQNyjVkuDyFEdvIMwuLZYs6PHc0+MfLwzwi/NYe+wx8b51CvLipnwXxH9x8iCh+s4Kvpva/ M0c5cXeCHHwOLW2KPgwXkSNdjarPnmAjuqvqGNlFDtYtCw7WFXjPPWyJhEzmcCscCMhhwNNqzA C1GbtVhWP/iNzj5hj0PC7cc228/eOKB3mMFamRZt1e+Lxa6SUKJUDehGpMEp3mZaeTvOTBA8sW 5vw= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="268041786" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:50:36 +0800 IronPort-SDR: Hbe1T1dvJekxqElyckPLDUO2NLwqDAjZMMne/8LFuCHu8R+GmiLPYBKmvK32Tn8NCOoCoeXWMV 8ByTalAdA62K8XjpIbFLL27p3gwrTTYscBLPSsyU8SITiihx2Vx6shKlJEN3Vkt6eQCv5AU7dx LsSw4eXfFAiAH3zgi5FvPT+v8Q8FzEcyW6+MwYNUQ39RBctiFvZxGGVbq+8btpfJfM/r1HINiL mbcujXw/DRqBnuUKUsNVafX7dQU+WdASOJxUn4ntjk7sSbqXXocbAOmKK3LF4kpzAz4RiLJwjB nCprriK1CkMMprIJRPxLoY/m 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; 02 Apr 2021 05:31:58 -0700 IronPort-SDR: XmqPnCjvVyetddd5SJeKqCslIbJ5dbbkQqr3vGkcCxQw+OvNkd5Wd6FtNaZujFd8OQ3Kpb48pq VtNPzps9rY3guhyvlAsVHJgOGRl08WzksaGdgm6VaRTsO6wW/0c/b2emKZlJhW1a8JIT9ZEP6/ hMD8fej1kHnBRzhGAli4gpKu2bAhzo9+5VHbbOnLaKwO8ZT8X+RwiZkbN1wETKpMRXT9TLqHyz +XPzDXGQ2URIPDn2n97/JjEKUeJhyNgRYypJd1Jb+Q3Sy0zfUs4rkP458JtyTKsOF7ON/tWs/q 2Xk= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Apr 2021 05:50:17 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 7/8] target/riscv/pmp: Remove outdated comment Date: Fri, 2 Apr 2021 08:48:22 -0400 Message-Id: <59a0c0d7237109dee9dea28023f953d2ae3523b8.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=68.232.143.124; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa2.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 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/pmp.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index 3794c808e8..07e4c407ab 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -19,10 +19,6 @@ * this program. If not, see . */ -/* - * PMP (Physical Memory Protection) is as-of-yet unused and needs testing. - */ - #include "qemu/osdep.h" #include "qemu/log.h" #include "qapi/error.h" From patchwork Fri Apr 2 12:48:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1461692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.a=rsa-sha256 header.s=dkim.wdc.com header.b=Q+WiiRuP; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FBg8S5ZTrz9sVq for ; Fri, 2 Apr 2021 23:58:16 +1100 (AEDT) Received: from localhost ([::1]:58176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSJNO-000240-CT for incoming@patchwork.ozlabs.org; Fri, 02 Apr 2021 08:58:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJGF-0002Sg-Cr; Fri, 02 Apr 2021 08:50:51 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:17449) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSJGD-0005hK-JY; Fri, 02 Apr 2021 08:50:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1617367849; x=1648903849; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RM8Mr4suL3sEGe4S9yx+Sev8HReBhHJuMKcUkt6KKxs=; b=Q+WiiRuPqoSzRAIvuXqQY2/SgBSNIsuG4h1C7PktsG3963eAAA/+3EgR M1UQraX+7dPvsFay7qpTaCkrstIO883gJjYGMgFS1KMlqxFnmy2zRjygY tEXHc8nimkh/KiD8RHWn1O0hKFA93kNUMGraacPImifXHNx8EAkubAthD uUf72MqSNhwtpTboNfaAMiesmKcGkS07m7HsZiEyMQohmq1TOZtSp1J5f qlNkD1Rs4gBE2RM4m5sxr9fpLqHwPbt/hC2B/tAf+b5UlHD78HNZus97c SfoOam1U6USvkzDJIfpahTdXkskAEWBdzXzutE7nxUqfYxQIrHmuFfjOo w==; IronPort-SDR: 7xJI0CfrGyB8MnN7kXK4HsY2iyBNRV1SUWyPGTZ7PIik+Wt37yEJEbFyL+Xsow9cBffo9/39xO gmIBMq+k9Ix3eV8eh19kRwmiIHs/xHLP0OubymOO1gAfU6d63CQyEwtPovQUwByr+fa2a+E08M 3ZcGDn1VwHZDwdW4uJjvMqEENP5IP3GFyWxLQn6yUGew1tDKws2LzYt8Pn+03YL9InxnboY5sp gisAgXxEERjQruiaVdjFSKsIou9MzX94rWVyQozTxsFHIlMCQU+CkIcwPKcWX01fAAdiMs6y8p gBk= X-IronPort-AV: E=Sophos;i="5.81,299,1610380800"; d="scan'208";a="163523945" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 02 Apr 2021 20:50:34 +0800 IronPort-SDR: LRF1kOaCW0NJ7NH4pruF5EBgj83eKTy9a+hI04QRqodNYNBiwBMCXtPmQ8W1JZzflZ10ERnADp hZo1611AU/0Kc9jn1A5Y25dSbxxG83lYU/Vswav5g5UBbcOqM2WnexA1oM4nSSqQ/pJIEzjBpM yzEmfrzSQF5wzAWuteBqY+FqGqm0tl3NHKtHUJnHXBQSdiwli2ud+I6i7Am5oK6nBO0WLIXVTN vKYwHwlKRzmK8OzMjSpHFePdHZoNWmmreODLMWvedHAio6KFHkUDNgUud28bYG8ccEd+2XNRtz a6Ing2ihKp8MjD1HgVeAFlnv Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2021 05:30:34 -0700 IronPort-SDR: k0sGHOl0Q2jfZGfSnheg+QV/Xb9hCWoLMm7kpXWElKlcZ/41GWPGr0iJnRSCFzzpgOXiECwfRZ L7nHy3NdHPzHL9yibxWDdlCNpEBR6EoMmYFEQNLdiUK0TN0rbVoD8qN+m0VCjbaekGiCD9wIhL JTSr9Vzhb1rhkQvULQ9KdeN0Ese47CrbE3bHLznDlYnBnnsytapkG9Z2D6d0qFF8d/Jppg54Yp R/Afp7xkUt03qZZbacvyyLzKMNNrW1Uf7XiLjXsnavVK2wHNY3GcOlA1TipGNEHaCZMlbtRKtX HbA= WDCIronportException: Internal Received: from unknown (HELO alistair-risc6-laptop.wdc.com) ([10.225.167.78]) by uls-op-cesaip01.wdc.com with ESMTP; 02 Apr 2021 05:50:27 -0700 From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 8/8] target/riscv: Add ePMP support for the Ibex CPU Date: Fri, 2 Apr 2021 08:48:31 -0400 Message-Id: <169e1a3c65731c9ee5be4d0c394d53d0d8b2655d.1617367533.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=7197bd837=alistair.francis@wdc.com; helo=esa4.hgst.iphmx.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: weiying_hou@outlook.com, Ethan.Lee.QNL@gmail.com, alistair.francis@wdc.com, alistair23@gmail.com, palmer@dabbelt.com, bmeng.cn@gmail.com, camiyoru@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The physical Ibex CPU has ePMP support and it's enabled for the OpenTitan machine so let's enable ePMP support for the Ibex CPU in QEMU. Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- target/riscv/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d665681f90..244066a6fc 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -202,6 +202,7 @@ static void rv32_ibex_cpu_init(Object *obj) set_misa(env, RV32 | RVI | RVM | RVC | RVU); set_priv_version(env, PRIV_VERSION_1_10_0); qdev_prop_set_bit(DEVICE(obj), "mmu", false); + qdev_prop_set_bit(DEVICE(obj), "x-epmp", true); } static void rv32_imafcu_nommu_cpu_init(Object *obj)