From d920cdeeb47056e6976198384cd31f6e2e7b97da Mon Sep 17 00:00:00 2001
From: YenHaoChen <39526191+YenHaoChen@users.noreply.github.com>
Date: Tue, 12 Jul 2022 06:13:10 +0800
Subject: Allow writes to pmp(i-1)cfg on locked pmp(i)cfg (#1039)

The privileged spec allows writes to pmp(i-1)cfg with locked pmp(i)cfg
(According to a recent discussion: https://github.com/riscv/riscv-isa-manual/issues/866)
---
 riscv/csrs.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/riscv/csrs.cc b/riscv/csrs.cc
index 6bca99c..c5e65c8 100644
--- a/riscv/csrs.cc
+++ b/riscv/csrs.cc
@@ -248,7 +248,7 @@ bool pmpcfg_csr_t::unlogged_write(const reg_t val) noexcept {
   for (size_t i0 = (address - CSR_PMPCFG0) * 4, i = i0; i < i0 + proc->get_xlen() / 8; i++) {
     if (i < proc->n_pmp) {
       const bool locked = (state->pmpaddr[i]->cfg & PMP_L);
-      if (rlb || (!locked && !state->pmpaddr[i]->next_locked_and_tor())) {
+      if (rlb || !locked) {
         uint8_t cfg = (val >> (8 * (i - i0))) & (PMP_R | PMP_W | PMP_X | PMP_A | PMP_L);
         // Drop R=0 W=1 when MML = 0
         // Remove the restriction when MML = 1
-- 
cgit v1.1