From nobody Sat May 18 21:45:43 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=1603353982; cv=none; d=zohomail.com; s=zohoarc; b=kwb+jfrw2BEup/PEoQ/LVJ2Neh+21zd7yJMxbnWeBc3ZNwrnrdSNHK+ARqwU0YuaUqh2Njfki+vgMR8WAwd28S72Ce63YCy7+nmWxoI2Qmhw1/mW3i/3WqulCtGGOqNrfyWzlN97+i6NNOGV4w4go60n7NJRsv0o+gUBEuTvf0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603353982; 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; bh=WmDOUqzmm4YvxIZYkfaW1jt4NlCUvEDA4fCo/yUiw8I=; b=Rsk0AX4gH4gA22FzMO1kCu4UWJoBzIOr369yKHg/7P7iUjQdbPSsphIV2UeJMlzQqRXJnL/pPl0UlzGvlFfbjY5DDJSe02mGX0ElXylC5kGnNJSbRmaK9lMXCmr55IVHIz2NH+lj+5aKCU+phbZnDmQgPAXXJA6eSMppgohEd5k= 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 1603353982772819.8459242459069; Thu, 22 Oct 2020 01:06:22 -0700 (PDT) Received: from localhost ([::1]:57648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVc5-0001bb-Ko for importer@patchew.org; Thu, 22 Oct 2020 04:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVac-00087h-Bo; Thu, 22 Oct 2020 04:04:52 -0400 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]:46731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVVaY-0006tj-No; Thu, 22 Oct 2020 04:04:48 -0400 Received: by mail-lj1-x242.google.com with SMTP id c21so920165ljn.13; Thu, 22 Oct 2020 01:04:45 -0700 (PDT) Received: from neptune.lab ([46.39.229.104]) by smtp.googlemail.com with ESMTPSA id l8sm143682lfk.203.2020.10.22.01.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 01:04:43 -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=WmDOUqzmm4YvxIZYkfaW1jt4NlCUvEDA4fCo/yUiw8I=; b=MONxc6Yr1Bu4tf5cGOiZDyt+vbrBLdUXx0oOPTJP7C/FqLJY1uDArajfYK0PHEMDDm UxYjv3I3BFQ/WZfqzVRur2pW+BSpPg+5EvkXKgVVd/awhckcMh9CbWww51kDZyyjJSpG UZo6twHIa54FhR8EDL/ArqBQoGJM5zTQUDJ7kAc4NKqcIeL97caBDJRI5FubgdfLmMOw YXhwtqDM13YD02hFS74D0uZmFn1DjLcCsVErmg6hkQ83aEQcqXuILaSNwOJMC+mw3pxV 1JeCYylTiTVCfGj1MwAzpM8nmLujMs2TUVFQjkNE1p7ua57Gssz9l/3gWu6GbC8EnWK/ YkCg== 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=WmDOUqzmm4YvxIZYkfaW1jt4NlCUvEDA4fCo/yUiw8I=; b=RdLK7/W6rB3UimUTOUG02U0cOhWrFIR0TP+niF3/2OuOhLPrJ961Hp0mS3iCVFNkDq fKxFlWrHmZYvGDLY20EphcZR9X9oa7Nj1nYbaMBMH0ZfaE/JU6xGQzuiV/t6mIPsPuu4 dq5xDwL2E4xFw8LZFQC16Tc9e481EbrxSkw22MK3+PXMS3JqtfhGSh4NKHCyj6kwUHZL zCcd4MKhwa+fCx/1fyC5exz/kaYZoPNRnzDDUYL2FV/rRXxV4sngzKA7xRfxuLW4RJmO A8al1gnusi8SmJaGplz3jXnygvCQ/hxZMeJN8zaU/Zw2PBfDNP1dzVsd4F5hVW4/V6Vl 0efg== X-Gm-Message-State: AOAM5338rqBBLdr9jDf012A5580eiEehvA+QTfY78CpICrJ/40YNPNX7 hOcMcLuI8ComjDgyLdZMeCM= X-Google-Smtp-Source: ABdhPJz5n0W1+jDT2RzptwxiHZGezwvpWL7fyJyFSJn8pRK5rpSug2CR5wLjgTa9kAUfX9f+x1d9sw== X-Received: by 2002:a2e:8787:: with SMTP id n7mr552819lji.111.1603353883855; Thu, 22 Oct 2020 01:04:43 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v6 1/6] [RISCV_PM] Add J-extension into RISC-V Date: Thu, 22 Oct 2020 11:04:35 +0300 Message-Id: <20201022080440.10069-2-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022080440.10069-1-space.monkey.delivers@gmail.com> References: <20201022080440.10069-1-space.monkey.delivers@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=2a00:1450:4864:20::242; envelope-from=baturo.alexey@gmail.com; helo=mail-lj1-x242.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-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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com 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" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 0bbfd7f457..4e305249b3 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -516,6 +516,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("u", RISCVCPU, cfg.ext_u, true), /* This is experimental so mark with 'x-' */ DEFINE_PROP_BOOL("x-h", RISCVCPU, cfg.ext_h, false), + DEFINE_PROP_BOOL("x-j", RISCVCPU, cfg.ext_j, false), DEFINE_PROP_BOOL("x-v", RISCVCPU, cfg.ext_v, false), DEFINE_PROP_BOOL("Counters", RISCVCPU, cfg.ext_counters, true), DEFINE_PROP_BOOL("Zifencei", RISCVCPU, cfg.ext_ifencei, true), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index de275782e6..eca611a367 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -66,6 +66,7 @@ #define RVS RV('S') #define RVU RV('U') #define RVH RV('H') +#define RVJ RV('J') =20 /* S extension denotes that Supervisor mode exists, however it is possible to have a core that support S mode but does not have an MMU and there @@ -277,6 +278,7 @@ struct RISCVCPU { bool ext_s; bool ext_u; bool ext_h; + bool ext_j; bool ext_v; bool ext_counters; bool ext_ifencei; --=20 2.20.1 From nobody Sat May 18 21:45:43 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=1603353980; cv=none; d=zohomail.com; s=zohoarc; b=U8CGWNGmMGG7/jm8yYcBkN5PwsOmhUNmqo206/uTC7uuGBiasY/PasfbqxHnLOKr1FZL4+nfLSnsLfLBrqBP6QREIsgYhbErwi0ZPEasL5sn5KSG5a8DMMynTAbJMQyeG8c3E9Uid17FgGJfCjRcHV6qj7iHu1gZI0oeJRm7KJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603353980; 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; bh=NhA/Yx4IzGlO7kzPXnIit66vJX4zfC+2x0DyLT9E1sw=; b=RXzwaP774Su4EuTL6IHzj5GX1trQ/jhMss8IzNNn62ljuP4e+XLLlW2aImKK3/u4CF2GlT9ZvdgcsfPZr/yaMDqgFz6EKkH2SxWWkRyuE3ishwuZC7soTrTwjrQyThpne73D+ksV9sNn0Msfyt/4EQ2D5e5O6RBYrcBbM4FKeAA= 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 1603353980552920.2763862288814; Thu, 22 Oct 2020 01:06:20 -0700 (PDT) Received: from localhost ([::1]:57460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVc3-0001Wy-7L for importer@patchew.org; Thu, 22 Oct 2020 04:06:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVae-00088Q-NT; Thu, 22 Oct 2020 04:04:52 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]:38987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVVaZ-0006tr-3j; Thu, 22 Oct 2020 04:04:51 -0400 Received: by mail-lf1-x134.google.com with SMTP id 184so1097301lfd.6; Thu, 22 Oct 2020 01:04:46 -0700 (PDT) Received: from neptune.lab ([46.39.229.104]) by smtp.googlemail.com with ESMTPSA id l8sm143682lfk.203.2020.10.22.01.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 01:04:44 -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=NhA/Yx4IzGlO7kzPXnIit66vJX4zfC+2x0DyLT9E1sw=; b=ev0BtpBgL6O3sR4nFEjC28Rit1NwDoPmIrQDdjqhQm48pCr4gB2CoSnzCBKdy3YLAO 2POJzWcS8By9FRVRh4cNoCjT34L2ZZ9AY40wMnYqhqHq6+DnIwvDOpAodWWgUoXGmrfA +59Q5dGNNz2zWTKhXA7GEHla9GykkEMBeB8wKSRskQSKuFSemasQ2ykFHQwzQQw8Yt+S +Zxy22AHSH4Ak5FRE1p9djZiv87nwlulFyKTFg5xrSZ22fv9Slm3aKcunKoQSBGKUtxy K4+JKgVXo6Spc9FS8SUAkCmDacD5Ai8j0utVKpTSZ8J3ivgkx3F6E+/bOmqB00SGGssM +aqg== 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=NhA/Yx4IzGlO7kzPXnIit66vJX4zfC+2x0DyLT9E1sw=; b=hrHwVdFH/o72006KauHOFWYW2tyvuTPF89S9U4xH+nlV+rMvbzvfocIPI+uqkITzAq khcwOelaovyu+FI9X5udAFjRa8JbSsSbBUv0bIHF3ezCcfhzUG3AxBXmNu5qJndzd5W9 4vqwbzH22hLKozAtaVTpNN+Q1goqwiFeB95GcujlbLLIPwK7DnAGJQcNA049A7INB9MH +xuCYbyyo0gjsBqztZ5+0vNxmvqS1Of4CsiDe23r52IzIjkl3ZjyHbNbulhSdkqUAC83 W7iuYKpYRCJfp2lefiWn22gJ0ARweXTrNHgBuDusgyqVr9B+AXjp6WoHSB6JGiVoeCa7 Ov0g== X-Gm-Message-State: AOAM532E6SK++gyp4WRwm87FOLqp6qGoUjdZnBAFs6jg3Pmb/6q2U78T 76iuhfKjh9NKN4ZBslf617Y= X-Google-Smtp-Source: ABdhPJwK80m6wZ8x172qksDA93Fe+LOfrxa2YDxCaH5041rdIbYazpPNykm3/hKkHjx98Ndhv0L0lQ== X-Received: by 2002:a05:6512:3710:: with SMTP id z16mr449928lfr.504.1603353884982; Thu, 22 Oct 2020 01:04:44 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v6 2/6] [RISCV_PM] Support CSRs required for RISC-V PM extension except for ones in hypervisor mode Date: Thu, 22 Oct 2020 11:04:36 +0300 Message-Id: <20201022080440.10069-3-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022080440.10069-1-space.monkey.delivers@gmail.com> References: <20201022080440.10069-1-space.monkey.delivers@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=2a00:1450:4864:20::134; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x134.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-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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com 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" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 3 + target/riscv/cpu.h | 12 ++ target/riscv/cpu_bits.h | 66 ++++++++++ target/riscv/csr.c | 271 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 352 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 4e305249b3..db72f5cf59 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -438,6 +438,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error *= *errp) if (cpu->cfg.ext_h) { target_misa |=3D RVH; } + if (cpu->cfg.ext_j) { + env->mmte |=3D PM_EXT_INITIAL; + } if (cpu->cfg.ext_v) { target_misa |=3D RVV; if (!is_power_of_2(cpu->cfg.vlen)) { diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index eca611a367..c236f01fff 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -226,6 +226,18 @@ struct CPURISCVState { =20 /* True if in debugger mode. */ bool debugger; + + /* + * CSRs for PM + * TODO: move these csr to appropriate groups + */ + target_ulong mmte; + target_ulong mpmmask; + target_ulong mpmbase; + target_ulong spmmask; + target_ulong spmbase; + target_ulong upmmask; + target_ulong upmbase; #endif =20 float_status fp_status; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index bd36062877..84c93c77ae 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -354,6 +354,21 @@ #define CSR_MHPMCOUNTER30H 0xb9e #define CSR_MHPMCOUNTER31H 0xb9f =20 +/* Custom user register */ +#define CSR_UMTE 0x8c0 +#define CSR_UPMMASK 0x8c1 +#define CSR_UPMBASE 0x8c2 + +/* Custom machine register */ +#define CSR_MMTE 0x7c0 +#define CSR_MPMMASK 0x7c1 +#define CSR_MPMBASE 0x7c2 + +/* Custom supervisor register */ +#define CSR_SMTE 0x9c0 +#define CSR_SPMMASK 0x9c1 +#define CSR_SPMBASE 0x9c2 + /* Legacy Machine Protection and Translation (priv v1.9.1) */ #define CSR_MBASE 0x380 #define CSR_MBOUND 0x381 @@ -604,4 +619,55 @@ #define MIE_UTIE (1 << IRQ_U_TIMER) #define MIE_SSIE (1 << IRQ_S_SOFT) #define MIE_USIE (1 << IRQ_U_SOFT) + +/* general mte CSR bits*/ +#define PM_ENABLE 0x00000001ULL +#define PM_CURRENT 0x00000002ULL +#define PM_XS_MASK 0x00000003ULL + +/* PM XS bits values */ +#define PM_EXT_DISABLE 0x00000000ULL +#define PM_EXT_INITIAL 0x00000001ULL +#define PM_EXT_CLEAN 0x00000002ULL +#define PM_EXT_DIRTY 0x00000003ULL + +/* offsets for every pair of control bits per each priv level */ +#define XS_OFFSET 0ULL +#define U_OFFSET 2ULL +#define S_OFFSET 4ULL +#define M_OFFSET 6ULL + +#define PM_XS_BITS (PM_XS_MASK << XS_OFFSET) +#define U_PM_ENABLE (PM_ENABLE << U_OFFSET) +#define U_PM_CURRENT (PM_CURRENT << U_OFFSET) +#define S_PM_ENABLE (PM_ENABLE << S_OFFSET) +#define S_PM_CURRENT (PM_CURRENT << S_OFFSET) +#define M_PM_ENABLE (PM_ENABLE << M_OFFSET) + +/* mmte CSR bits */ +#define MMTE_PM_XS_BITS PM_XS_BITS +#define MMTE_U_PM_ENABLE U_PM_ENABLE +#define MMTE_U_PM_CURRENT U_PM_CURRENT +#define MMTE_S_PM_ENABLE S_PM_ENABLE +#define MMTE_S_PM_CURRENT S_PM_CURRENT +#define MMTE_M_PM_ENABLE M_PM_ENABLE +#define MMTE_MASK (MMTE_U_PM_ENABLE | MMTE_U_PM_CURRENT | \ + MMTE_S_PM_ENABLE | MMTE_S_PM_CURRENT | \ + MMTE_M_PM_ENABLE | MMTE_PM_XS_BITS) + +/* smte CSR bits */ +#define SMTE_PM_XS_BITS PM_XS_BITS +#define SMTE_U_PM_ENABLE U_PM_ENABLE +#define SMTE_U_PM_CURRENT U_PM_CURRENT +#define SMTE_S_PM_ENABLE S_PM_ENABLE +#define SMTE_S_PM_CURRENT S_PM_CURRENT +#define SMTE_MASK (SMTE_U_PM_ENABLE | SMTE_U_PM_CURRENT | \ + SMTE_S_PM_ENABLE | SMTE_S_PM_CURRENT | \ + SMTE_PM_XS_BITS) + +/* umte CSR bits */ +#define UMTE_U_PM_ENABLE U_PM_ENABLE +#define UMTE_U_PM_CURRENT U_PM_CURRENT +#define UMTE_MASK (UMTE_U_PM_ENABLE | MMTE_U_PM_CURRENT) + #endif diff --git a/target/riscv/csr.c b/target/riscv/csr.c index aaef6c6f20..e4839c8fc9 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -140,6 +140,11 @@ static int any(CPURISCVState *env, int csrno) return 0; } =20 +static int umode(CPURISCVState *env, int csrno) +{ + return -!riscv_has_ext(env, RVU); +} + static int smode(CPURISCVState *env, int csrno) { return -!riscv_has_ext(env, RVS); @@ -1250,6 +1255,257 @@ static int write_pmpaddr(CPURISCVState *env, int cs= rno, target_ulong val) return 0; } =20 +/* + * Functions to access Pointer Masking feature registers + * We have to check if current priv lvl could modify + * csr in given mode + */ +static int check_pm_current_disabled(CPURISCVState *env, int csrno) +{ + int csr_priv =3D get_field(csrno, 0xC00); + /* + * If priv lvls differ that means we're accessing csr from higher priv= lvl, + * so allow the access + */ + if (env->priv !=3D csr_priv) { + return 0; + } + int cur_bit_pos; + switch (env->priv) { + case PRV_M: + /* m-mode is always allowed to modify registers, so allow */ + return 0; + case PRV_S: + cur_bit_pos =3D S_PM_CURRENT; + break; + case PRV_U: + cur_bit_pos =3D U_PM_CURRENT; + break; + default: + g_assert_not_reached(); + } + int pm_current =3D get_field(env->mmte, cur_bit_pos); + /* It's same priv lvl, so we allow to modify csr only if pm_current=3D= =3D1 */ + return !pm_current; +} + +static int read_mmte(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + *val =3D 0; + return 0; + } + *val =3D env->mmte & MMTE_MASK; + return 0; +} + +static int write_mmte(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + target_ulong wpri_val =3D val & MMTE_MASK; + if (val !=3D wpri_val) { + qemu_log_mask(LOG_GUEST_ERROR, + "MMTE: WPRI violation written 0x%lx vs expected 0x%l= x\n", + val, wpri_val); + } + env->mmte =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_smte(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + *val =3D 0; + return 0; + } + *val =3D env->mmte & SMTE_MASK; + return 0; +} + +static int write_smte(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + target_ulong wpri_val =3D val & SMTE_MASK; + if (val !=3D wpri_val) { + qemu_log_mask(LOG_GUEST_ERROR, + "SMTE: WPRI violation written 0x%lx vs expected 0x%l= x\n", + val, wpri_val); + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + target_ulong new_val =3D val | (env->mmte & ~SMTE_MASK); + write_mmte(env, csrno, new_val); + return 0; +} + +static int read_umte(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + *val =3D 0; + return 0; + } + *val =3D env->mmte & UMTE_MASK; + return 0; +} + +static int write_umte(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + target_ulong wpri_val =3D val & UMTE_MASK; + assert(val =3D=3D wpri_val); + if (val !=3D wpri_val) { + qemu_log_mask(LOG_GUEST_ERROR, + "UMTE: WPRI violation written 0x%lx vs expected 0x%l= x\n", + val, wpri_val); + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + target_ulong new_val =3D val | (env->mmte & ~UMTE_MASK); + write_mmte(env, csrno, new_val); + return 0; +} + +static int read_mpmmask(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->mpmmask; + return 0; +} + +static int write_mpmmask(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + env->mpmmask =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_spmmask(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->spmmask; + return 0; +} + +static int write_spmmask(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->spmmask =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_upmmask(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->upmmask; + return 0; +} + +static int write_upmmask(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->upmmask =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_mpmbase(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->mpmbase; + return 0; +} + +static int write_mpmbase(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + env->mpmbase =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_spmbase(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->spmbase; + return 0; +} + +static int write_spmbase(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->spmbase =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} + +static int read_upmbase(CPURISCVState *env, int csrno, target_ulong *val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + *val =3D env->upmbase; + return 0; +} + +static int write_upmbase(CPURISCVState *env, int csrno, target_ulong val) +{ + if (!riscv_has_ext(env, RVJ)) { + return -RISCV_EXCP_ILLEGAL_INST; + } + if (check_pm_current_disabled(env, csrno)) { + return 0; + } + env->upmbase =3D val; + env->mstatus |=3D MSTATUS_XS | MSTATUS_SD; + env->mmte |=3D PM_EXT_DIRTY; + return 0; +} #endif =20 /* @@ -1471,6 +1727,21 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = =3D { [CSR_PMPCFG0 ... CSR_PMPCFG3] =3D { pmp, read_pmpcfg, write_pmpc= fg }, [CSR_PMPADDR0 ... CSR_PMPADDR15] =3D { pmp, read_pmpaddr, write_pmpa= ddr }, =20 + /* User Pointer Masking */ + [CSR_UMTE] =3D { umode, read_umte, write_umte = }, + [CSR_UPMMASK] =3D { umode, read_upmmask, write_upmmas= k }, + [CSR_UPMBASE] =3D { umode, read_upmbase, write_upmbas= e }, + + /* Machine Pointer Masking */ + [CSR_MMTE] =3D { any, read_mmte, write_mmte = }, + [CSR_MPMMASK] =3D { any, read_mpmmask, write_mpmmask = }, + [CSR_MPMBASE] =3D { any, read_mpmbase, write_mpmbase = }, + + /* Supervisor Pointer Masking */ + [CSR_SMTE] =3D { smode, read_smte, write_smte = }, + [CSR_SPMMASK] =3D { smode, read_spmmask, write_spmmask= }, + [CSR_SPMBASE] =3D { smode, read_spmbase, write_spmbase= }, + /* Performance Counters */ [CSR_HPMCOUNTER3 ... CSR_HPMCOUNTER31] =3D { ctr, read_zero = }, [CSR_MHPMCOUNTER3 ... CSR_MHPMCOUNTER31] =3D { any, read_zero = }, --=20 2.20.1 From nobody Sat May 18 21:45:43 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=1603353979; cv=none; d=zohomail.com; s=zohoarc; b=Ytv3B3j30BQT+Wvr5vFh4FFUZvgo6hcHt4EQFMWwJydO2y2jv0rcIqLBIgkbfBvB3UY6hgBqUJ1gbc0Idt7JfqeIOJx21j9kLRRk7anRtPXfHmVAKLMJIzOGwbg0TNR1zI58EyFs49yP0uffAf0Y1pyiXS08eU/WHfcbZyx1eIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603353979; 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; bh=iGcClsENfMRlEEj1DdXzesuzsrG1w6qHhs9fkCduQVY=; b=mSEw7oPeW6DHD9vM5F+9TWCgtPJKjsommVou96bvgADgmzso/SJvQdy0DFB8ENjElrTKn1VwM54eL9/8JzgoFVphlZ/DnSKEdcQbpyop7B3jfg7GLqKfv1HS24Z725gb7glvzpoJ2TAdR4NZ4YH/OdU70gUVvUjyLS9wgIgxhzU= 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 1603353979541769.5892399314594; Thu, 22 Oct 2020 01:06:19 -0700 (PDT) Received: from localhost ([::1]:57344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVc2-0001UD-5K for importer@patchew.org; Thu, 22 Oct 2020 04:06:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVae-00088U-Oi; Thu, 22 Oct 2020 04:04:52 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:39533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVVaa-0006u4-U8; Thu, 22 Oct 2020 04:04:52 -0400 Received: by mail-lf1-x144.google.com with SMTP id 184so1097353lfd.6; Thu, 22 Oct 2020 01:04:47 -0700 (PDT) Received: from neptune.lab ([46.39.229.104]) by smtp.googlemail.com with ESMTPSA id l8sm143682lfk.203.2020.10.22.01.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 01:04:45 -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=iGcClsENfMRlEEj1DdXzesuzsrG1w6qHhs9fkCduQVY=; b=CJYX4ZSW5/VMt03Y11boMcvybP4qdZStwV74ZiFjKvivQF1pHAnYrm861X3PzGFnJ1 h4HBn8jTqcH0rIpp6XL+1KKqKS65U61wpyFenUZgrZ6OJMmoPQeaqBfc9fBHwGtncyN8 h+H2wpZDksutW6RujgJLaSYL1jP44ciYXOUVKmLUL1GkShipJcVcA79ayp90QW3UOUKW JLKxJdNJd57Rq6LaGhfUqhoetjLR1Sa/FiGp57l9k4jIsttqvU1+TV+nT8VuvM8SUrVf qmlR4TMyBylNOf5SP5eaJK5X1aQ/1LLjjcG1+A0fTFztHJxOefl6y4yJZ9eCC+259LOM kx1A== 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=iGcClsENfMRlEEj1DdXzesuzsrG1w6qHhs9fkCduQVY=; b=oGfiqofOPvhtfjLalhORy3mYpssQRmttjlBwNQiMWeQ07zZJ2oS8ZblYhX+kFxtAYO GmPiBjFwt2R18e78/J0bJVVyukqDvIHsHPN+ynmm8uoSf7IhtpiDR3T6f4Y5hMk6rUSj gDH7yye1OkEM/Rxp4eGXR9GuT1+comczEsu+8l/kDiZ4u/P5EK7omh5gkMC4NfOVu9yJ hLnreHLrh6HnReZuXRU6W/Lb+cIofjzzdhYN55i3Kq95IP2FkDT0CGC2J2IPWsovKToi Zh4MSm5tY8YZF+HJlNG7folKjtdH5/kWt71kiY1Y4gDD3XjLHjvb9iiahWTug5UQhI5V 0X7g== X-Gm-Message-State: AOAM533d9wtVJQnor37O8A109Q1MhJBaIW6joGVYUI/I5lCkY+VG/6IF Tq84GmZmYZOwaVNHrImj1r8= X-Google-Smtp-Source: ABdhPJyPUOhV60LC3UiNTRdfzsU0hecVOYo9kyED9LZNrx+NQt2Vagl4y/MEa4kAgtSNhZrmgFoaEQ== X-Received: by 2002:ac2:4d0c:: with SMTP id r12mr405949lfi.74.1603353886234; Thu, 22 Oct 2020 01:04:46 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v6 3/6] [RISCV_PM] Print new PM CSRs in QEMU logs Date: Thu, 22 Oct 2020 11:04:37 +0300 Message-Id: <20201022080440.10069-4-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022080440.10069-1-space.monkey.delivers@gmail.com> References: <20201022080440.10069-1-space.monkey.delivers@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=2a00:1450:4864:20::144; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x144.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-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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com 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" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index db72f5cf59..1c00d9ea26 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -255,6 +255,31 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f= , int flags) qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "htval ", env->htval); qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mtval2 ", env->mtval2); } + if (riscv_has_ext(env, RVJ)) { + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mmte ", env->mmte); + switch (env->priv) { + case PRV_U: + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "upmbase ", + env->upmbase); + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "upmmask ", + env->upmmask); + break; + case PRV_S: + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "spmbase ", + env->spmbase); + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "spmmask ", + env->spmmask); + break; + case PRV_M: + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mpmbase ", + env->mpmbase); + qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "mpmmask ", + env->mpmmask); + break; + default: + assert(0 && "Unreachable"); + } + } #endif =20 for (i =3D 0; i < 32; i++) { --=20 2.20.1 From nobody Sat May 18 21:45:43 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=1603354109; cv=none; d=zohomail.com; s=zohoarc; b=HsJ6dUQRIXxC8Z9dHqNCpNNV4yTch0CCBmpGSdGLWIoSV7SN+ILFZtKbz3A1K8tmHzlSiZFtxPVa4t2hLyZVibuYI+m624LVBIq363aK3e7wZGXDcOnXm1M3100qlnI2o3kimKIPNkpfK/7kUESKMjI4MZEPvHY48m5PshAN1X0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603354109; 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; bh=Lc9QIvOC4BQ5aEV3wggBnbdGYDm7vcPEJjFI1O17k4M=; b=lryIobHeRDSgF5DleGDN5L8i9eu5Q9r7Tuwv3kTkJ7DucAdmdFbQoDoo4z4HppZL8497Ub3kSebSwTiqgp+hs19mzW7H+IvOw3hnErfiZ7B/L4+1Ca3UtamjFfBiGEgRBtYqFJ3DqC5O9jPsJmmncNMRRioUEbQ5kzV6j+hjQHg= 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 1603354109826305.11863001684105; Thu, 22 Oct 2020 01:08:29 -0700 (PDT) Received: from localhost ([::1]:37024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVe8-0004gI-MS for importer@patchew.org; Thu, 22 Oct 2020 04:08:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVag-0008AI-20; Thu, 22 Oct 2020 04:04:54 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]:38589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVVac-0006v1-DE; Thu, 22 Oct 2020 04:04:53 -0400 Received: by mail-lf1-x134.google.com with SMTP id c141so1104165lfg.5; Thu, 22 Oct 2020 01:04:48 -0700 (PDT) Received: from neptune.lab ([46.39.229.104]) by smtp.googlemail.com with ESMTPSA id l8sm143682lfk.203.2020.10.22.01.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 01:04:46 -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=Lc9QIvOC4BQ5aEV3wggBnbdGYDm7vcPEJjFI1O17k4M=; b=Qiq7Drf2laNmiX53MT2AsQNeoyksKO5LlNs4Q14aVx6oeRd4ZJjsmvGVpnqVR2cvSA 5JzHfIwGMZeTFZn6Kgfu8QyCPIH2tQxuYAOyd24gm1mfNOFOMp2bG/d1Ef1V45CI6NYh 8fi+cl9TWL3HI512PtGcMqkLBGbb7+WQCUuCzVhvsL9j3aj3jaocBdbp5w3Ll/tfwdk6 QTIGxOE1Khw468VyFfIhPBdChqrY6JE4CNXEDqBnyQLhhvRUvV839YxPn9cMahuHbFOR b5qUuvhrnx1Xi3jqkvf/ydSVXdNd0x4NMuVBDvl41kDWnV1qEwjs/OCZfGU/KiqZz1+j wR9A== 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=Lc9QIvOC4BQ5aEV3wggBnbdGYDm7vcPEJjFI1O17k4M=; b=nM3bV3a6WFjkw5E2bS9KEk7DPdimK+KG0hSIpPyBiB40kyp4iuIkdNa1FMhBVosX/s uL7CzK6XJDomGTGBroig5u8fMoHDFY8jaOPfjuQNktw9rAXDO9KvUUlF34Qz9rYuEwxc HtPvupw6hRl/EE3cNbesF11HKg4EgDXLAd1Xyoh5pLRVy5A+ESHAB6yVrKEaEq0vmm30 /5D/uu7G+33T58e+T/zTnzlfpA2vswu9oOUseeiIoiFEhb/XVls0hDIzXusJaP0ylOKz L2wrDK5W9GnIx40FWSwLz9lDDkfbTk1J06c7wfz/rT56TCE9NvOOmLLMUSVhwgIccpbO AjsA== X-Gm-Message-State: AOAM532V5PkLuxxU32aO7pYVf1wEsjQmiMhFLivMayd6pmgY8J44jcr5 md8mkAUaHXGScZ5N+63QsfA= X-Google-Smtp-Source: ABdhPJzSKorU8kpeaFyMx56TGdt63GmRnPbz3Rl73E0quPJxpn8lZAvNc9QbiCyXPrhA4K7jaqkUfA== X-Received: by 2002:ac2:44bb:: with SMTP id c27mr390201lfm.223.1603353887237; Thu, 22 Oct 2020 01:04:47 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v6 4/6] [RISCV_PM] Support pointer masking for RISC-V for i/c/f/d/a types of instructions Date: Thu, 22 Oct 2020 11:04:38 +0300 Message-Id: <20201022080440.10069-5-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022080440.10069-1-space.monkey.delivers@gmail.com> References: <20201022080440.10069-1-space.monkey.delivers@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=2a00:1450:4864:20::134; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x134.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: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, GAPPY_SUBJECT=0.1, 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-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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com 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" Signed-off-by: Alexey Baturo --- target/riscv/insn_trans/trans_rva.c.inc | 3 +++ target/riscv/insn_trans/trans_rvd.c.inc | 2 ++ target/riscv/insn_trans/trans_rvf.c.inc | 2 ++ target/riscv/insn_trans/trans_rvi.c.inc | 2 ++ target/riscv/translate.c | 14 ++++++++++++++ 5 files changed, 23 insertions(+) diff --git a/target/riscv/insn_trans/trans_rva.c.inc b/target/riscv/insn_tr= ans/trans_rva.c.inc index be8a9f06dd..5559e347ba 100644 --- a/target/riscv/insn_trans/trans_rva.c.inc +++ b/target/riscv/insn_trans/trans_rva.c.inc @@ -26,6 +26,7 @@ static inline bool gen_lr(DisasContext *ctx, arg_atomic *= a, MemOp mop) if (a->rl) { tcg_gen_mb(TCG_MO_ALL | TCG_BAR_STRL); } + gen_pm_adjust_address(ctx, src1, src1); tcg_gen_qemu_ld_tl(load_val, src1, ctx->mem_idx, mop); if (a->aq) { tcg_gen_mb(TCG_MO_ALL | TCG_BAR_LDAQ); @@ -46,6 +47,7 @@ static inline bool gen_sc(DisasContext *ctx, arg_atomic *= a, MemOp mop) TCGLabel *l2 =3D gen_new_label(); =20 gen_get_gpr(src1, a->rs1); + gen_pm_adjust_address(ctx, src1, src1); tcg_gen_brcond_tl(TCG_COND_NE, load_res, src1, l1); =20 gen_get_gpr(src2, a->rs2); @@ -91,6 +93,7 @@ static bool gen_amo(DisasContext *ctx, arg_atomic *a, gen_get_gpr(src1, a->rs1); gen_get_gpr(src2, a->rs2); =20 + gen_pm_adjust_address(ctx, src1, src1); (*func)(src2, src1, src2, ctx->mem_idx, mop); =20 gen_set_gpr(a->rd, src2); diff --git a/target/riscv/insn_trans/trans_rvd.c.inc b/target/riscv/insn_tr= ans/trans_rvd.c.inc index 4f832637fa..935342f66d 100644 --- a/target/riscv/insn_trans/trans_rvd.c.inc +++ b/target/riscv/insn_trans/trans_rvd.c.inc @@ -25,6 +25,7 @@ static bool trans_fld(DisasContext *ctx, arg_fld *a) TCGv t0 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_ld_i64(cpu_fpr[a->rd], t0, ctx->mem_idx, MO_TEQ); =20 @@ -40,6 +41,7 @@ static bool trans_fsd(DisasContext *ctx, arg_fsd *a) TCGv t0 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_st_i64(cpu_fpr[a->rs2], t0, ctx->mem_idx, MO_TEQ); =20 diff --git a/target/riscv/insn_trans/trans_rvf.c.inc b/target/riscv/insn_tr= ans/trans_rvf.c.inc index 3dfec8211d..04b3c3eb3d 100644 --- a/target/riscv/insn_trans/trans_rvf.c.inc +++ b/target/riscv/insn_trans/trans_rvf.c.inc @@ -30,6 +30,7 @@ static bool trans_flw(DisasContext *ctx, arg_flw *a) TCGv t0 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_ld_i64(cpu_fpr[a->rd], t0, ctx->mem_idx, MO_TEUL); gen_nanbox_s(cpu_fpr[a->rd], cpu_fpr[a->rd]); @@ -47,6 +48,7 @@ static bool trans_fsw(DisasContext *ctx, arg_fsw *a) gen_get_gpr(t0, a->rs1); =20 tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_st_i64(cpu_fpr[a->rs2], t0, ctx->mem_idx, MO_TEUL); =20 diff --git a/target/riscv/insn_trans/trans_rvi.c.inc b/target/riscv/insn_tr= ans/trans_rvi.c.inc index d04ca0394c..bee7f6be46 100644 --- a/target/riscv/insn_trans/trans_rvi.c.inc +++ b/target/riscv/insn_trans/trans_rvi.c.inc @@ -141,6 +141,7 @@ static bool gen_load(DisasContext *ctx, arg_lb *a, MemO= p memop) TCGv t1 =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); =20 tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, memop); gen_set_gpr(a->rd, t1); @@ -180,6 +181,7 @@ static bool gen_store(DisasContext *ctx, arg_sb *a, Mem= Op memop) TCGv dat =3D tcg_temp_new(); gen_get_gpr(t0, a->rs1); tcg_gen_addi_tl(t0, t0, a->imm); + gen_pm_adjust_address(ctx, t0, t0); gen_get_gpr(dat, a->rs2); =20 tcg_gen_qemu_st_tl(dat, t0, ctx->mem_idx, memop); diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 79dca2291b..a7cbf909f3 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -101,6 +101,16 @@ static void gen_nanbox_s(TCGv_i64 out, TCGv_i64 in) tcg_gen_ori_i64(out, in, MAKE_64BIT_MASK(32, 32)); } =20 +/* + * Temp stub: generates address adjustment for PointerMasking + */ +static void gen_pm_adjust_address(DisasContext *s, + TCGv_i64 dst, + TCGv_i64 src) +{ + tcg_gen_mov_i64(dst, src); +} + /* * A narrow n-bit operation, where n < FLEN, checks that input operands * are correctly Nan-boxed, i.e., all upper FLEN - n bits are 1. @@ -380,6 +390,7 @@ static void gen_load_c(DisasContext *ctx, uint32_t opc,= int rd, int rs1, TCGv t1 =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); int memop =3D tcg_memop_lookup[(opc >> 12) & 0x7]; =20 if (memop < 0) { @@ -400,6 +411,7 @@ static void gen_store_c(DisasContext *ctx, uint32_t opc= , int rs1, int rs2, TCGv dat =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); gen_get_gpr(dat, rs2); int memop =3D tcg_memop_lookup[(opc >> 12) & 0x7]; =20 @@ -459,6 +471,7 @@ static void gen_fp_load(DisasContext *ctx, uint32_t opc= , int rd, t0 =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); =20 switch (opc) { case OPC_RISC_FLW: @@ -498,6 +511,7 @@ static void gen_fp_store(DisasContext *ctx, uint32_t op= c, int rs1, t0 =3D tcg_temp_new(); gen_get_gpr(t0, rs1); tcg_gen_addi_tl(t0, t0, imm); + gen_pm_adjust_address(ctx, t0, t0); =20 switch (opc) { case OPC_RISC_FSW: --=20 2.20.1 From nobody Sat May 18 21:45:43 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=1603354129; cv=none; d=zohomail.com; s=zohoarc; b=T25TawWJQ24P4D6YghA0BsBWze6XaOkKGRI8Z/6Y7A6Yz8Dfrb7qvLxl5zmWW6JdmcZQy43VUIADm9nXl5G/DCbBvO4M33p7Nrdf8HRua4c7hO5qrfl80Huk6QPAYZKCKO9uH8+GKluv5jW/24xJA0fV7vIKvip8g9OVbdr4NvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603354129; 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; bh=wX2ZkHWZTsLegDRadNX3/LscZ8sVu41yZQYaAwn+M+o=; b=kA8XlOuBeNvDMmoD0eDa1zYp+vpCX2H4T8setZ1esYi63wMQS8cIze5Ejrxwk1xqNhYdggH3NZYjFHJsLQhv8pVDand5aHJyikNNNYh/vAvJINz1yBaGACNQuo5OSWBHPXI6F5DG17nmh7rZJ5Q5XMuTOX+c+uocehYB/TFKx1M= 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 1603354129088728.7301305226966; Thu, 22 Oct 2020 01:08:49 -0700 (PDT) Received: from localhost ([::1]:37454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVeS-0004rL-4Z for importer@patchew.org; Thu, 22 Oct 2020 04:08:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVaf-000894-1k; Thu, 22 Oct 2020 04:04:53 -0400 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]:44886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVVac-0006vB-Fw; Thu, 22 Oct 2020 04:04:52 -0400 Received: by mail-lf1-x142.google.com with SMTP id b1so1081868lfp.11; Thu, 22 Oct 2020 01:04:49 -0700 (PDT) Received: from neptune.lab ([46.39.229.104]) by smtp.googlemail.com with ESMTPSA id l8sm143682lfk.203.2020.10.22.01.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 01:04:47 -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=wX2ZkHWZTsLegDRadNX3/LscZ8sVu41yZQYaAwn+M+o=; b=QHphouJt5o6A9ta685Lt8Xr19qrkDlay/vfYsHLOM/ubAKh1LShFVq9pw7OysDgvtH jp/X6QJhZ9k2IAPg9kg4AQ/lH26TXoO7VJR/GwGZ6WPKHV8IyqQiGXg5hzbmgEuu+AN4 iQXwK0f1IQwjQ7XgYT5lpqd9J9iJYbDQIknHlZsSess6BBJzuLC6mF+khFBnaHThstw+ UbXCqfB6jiAfAoGM385kDJSd+2ZioY2oACIcUa6CNurl8mifyh88UQG+EQMnnhXhkj6x WIz+++JGLSIqmC62d6oYkSAihYWwm8wdt+BjptTWAWV+87SGIOvxIa0IYEpq2B1ek5Cd m4rg== 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=wX2ZkHWZTsLegDRadNX3/LscZ8sVu41yZQYaAwn+M+o=; b=BDYM33Zhbvt6sXdHdI9OsD4cpURm/d4GSGW+7qz8paRkDhP/mpxZj1NAw1VCB8A0Mp gV+mDlKezhgrMFbjpauqr6LE/QkAncC6ihUfsSXvd5BLNXzp6HABFTSqdstuV3PneBxA AvfH9hS1MNKgAaa12iVq5CtxAnQWO61CsFVhU5awAKHTsM0M/3KImhIM3VunD2bbSDIh /XrbI5f5WCSZEiDXkjTa5VHUYwwloMxPWrBj48x2WyPkOvuyu55oF/cWOulwMsV3gSGe E7MratfoaQy43bBTlA3jjuZsMVfgIZVWHWHWrJM/5V2KIlILMu3U+iy3tb0wtJB70uQX p43A== X-Gm-Message-State: AOAM5305kvW727q/alQfhGCHoYUWGcrnp/ZUQ5FOUBBd4kd9NWw+F10X KSSc58X2jMBY0zvsh1l805E= X-Google-Smtp-Source: ABdhPJx/pBx/KG+bCJfSegZEvCzzwvKtzcAkPMdQm9rCsXUESEXjhBIzk+OuPEELTc49cGg53879Eg== X-Received: by 2002:a19:7f43:: with SMTP id a64mr397873lfd.449.1603353888267; Thu, 22 Oct 2020 01:04:48 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v6 5/6] [RISCV_PM] Implement address masking functions required for RISC-V Pointer Masking extension Date: Thu, 22 Oct 2020 11:04:39 +0300 Message-Id: <20201022080440.10069-6-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022080440.10069-1-space.monkey.delivers@gmail.com> References: <20201022080440.10069-1-space.monkey.delivers@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=2a00:1450:4864:20::142; envelope-from=baturo.alexey@gmail.com; helo=mail-lf1-x142.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-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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com 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: Anatoly Parshintsev Signed-off-by: Anatoly Parshintsev --- target/riscv/cpu.h | 19 +++++++++++++++++++ target/riscv/translate.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index c236f01fff..13accaa232 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -386,6 +386,7 @@ FIELD(TB_FLAGS, VL_EQ_VLMAX, 2, 1) FIELD(TB_FLAGS, LMUL, 3, 2) FIELD(TB_FLAGS, SEW, 5, 3) FIELD(TB_FLAGS, VILL, 8, 1) +FIELD(TB_FLAGS, PM_ENABLED, 9, 1) =20 /* * A simplification for VLMAX @@ -432,6 +433,24 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState = *env, target_ulong *pc, if (riscv_cpu_fp_enabled(env)) { flags |=3D env->mstatus & MSTATUS_FS; } + if (riscv_has_ext(env, RVJ)) { + int priv =3D cpu_mmu_index(env, false); + bool pm_enabled =3D false; + switch (priv) { + case PRV_U: + pm_enabled =3D env->mmte & U_PM_ENABLE; + break; + case PRV_S: + pm_enabled =3D env->mmte & S_PM_ENABLE; + break; + case PRV_M: + pm_enabled =3D env->mmte & M_PM_ENABLE; + break; + default: + g_assert_not_reached(); + } + flags =3D FIELD_DP32(flags, TB_FLAGS, PM_ENABLED, pm_enabled); + } #endif *pflags =3D flags; } diff --git a/target/riscv/translate.c b/target/riscv/translate.c index a7cbf909f3..b3e7b93bc9 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -36,6 +36,9 @@ static TCGv cpu_gpr[32], cpu_pc, cpu_vl; static TCGv_i64 cpu_fpr[32]; /* assume F and D extensions */ static TCGv load_res; static TCGv load_val; +/* globals for PM CSRs */ +static TCGv pm_mask[4]; +static TCGv pm_base[4]; =20 #include "exec/gen-icount.h" =20 @@ -63,6 +66,10 @@ typedef struct DisasContext { uint16_t vlen; uint16_t mlen; bool vl_eq_vlmax; + /* PointerMasking extension */ + bool pm_enabled; + TCGv pm_mask; + TCGv pm_base; } DisasContext; =20 #ifdef TARGET_RISCV64 @@ -102,13 +109,19 @@ static void gen_nanbox_s(TCGv_i64 out, TCGv_i64 in) } =20 /* - * Temp stub: generates address adjustment for PointerMasking + * Generates address adjustment for PointerMasking */ static void gen_pm_adjust_address(DisasContext *s, TCGv_i64 dst, TCGv_i64 src) { - tcg_gen_mov_i64(dst, src); + if (!s->pm_enabled) { + /* Load unmodified address */ + tcg_gen_mov_i64(dst, src); + } else { + tcg_gen_andc_i64(dst, src, s->pm_mask); + tcg_gen_or_i64(dst, dst, s->pm_base); + } } =20 /* @@ -826,6 +839,10 @@ static void riscv_tr_init_disas_context(DisasContextBa= se *dcbase, CPUState *cs) ctx->lmul =3D FIELD_EX32(tb_flags, TB_FLAGS, LMUL); ctx->mlen =3D 1 << (ctx->sew + 3 - ctx->lmul); ctx->vl_eq_vlmax =3D FIELD_EX32(tb_flags, TB_FLAGS, VL_EQ_VLMAX); + ctx->pm_enabled =3D FIELD_EX32(tb_flags, TB_FLAGS, PM_ENABLED); + int priv =3D cpu_mmu_index(env, false); + ctx->pm_mask =3D pm_mask[priv]; + ctx->pm_base =3D pm_base[priv]; } =20 static void riscv_tr_tb_start(DisasContextBase *db, CPUState *cpu) @@ -945,4 +962,17 @@ void riscv_translate_init(void) "load_res"); load_val =3D tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, load_= val), "load_val"); + /* Assign PM CSRs to tcg globals */ + pm_mask[PRV_U] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, upmmask), "upmma= sk"); + pm_base[PRV_U] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, upmbase), "upmba= se"); + pm_mask[PRV_S] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, spmmask), "spmma= sk"); + pm_base[PRV_S] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, spmbase), "spmba= se"); + pm_mask[PRV_M] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, mpmmask), "mpmma= sk"); + pm_base[PRV_M] =3D + tcg_global_mem_new(cpu_env, offsetof(CPURISCVState, mpmbase), "mpmba= se"); } --=20 2.20.1 From nobody Sat May 18 21:45:43 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=1603354224; cv=none; d=zohomail.com; s=zohoarc; b=X5O5pBwCnKgoDyzWdqdjo4kYbIsSjad4T4vLi1qPKzw2KI+Gv3QtJAGQTmlYHpZVQEe5uWA+7v1XHYI84GlUp5pTLphbnA/7dGcGA98IzCbfD5RP6uuO8IPy9DSIhGwb6+pNXr4mEuLdJ5TqsBKW5JhPrcRiQRBJJTJyzddQG0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603354224; 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; bh=O+goKHHTPNQf+byU52c8msGIZZ/A616sN7JzkzNgsEM=; b=PiXs5cLFDLDTRu+dONR2Mns7opYp0E59grloiUAlBxv/L5ZpgcFPZnzMlKlBXP0vrDOaA0b13dYV2pur8/tak99mtAb9qlsidCLjta8fogc1O5tUTh88t4DQ2YBcrRLE+Ch4rCrKxaIly1U4GIDG/tGC6E4dzw4hCVA+x0eippU= 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 1603354224653557.4032190254405; Thu, 22 Oct 2020 01:10:24 -0700 (PDT) Received: from localhost ([::1]:42396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVVfz-0006sg-IV for importer@patchew.org; Thu, 22 Oct 2020 04:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVVah-0008Eu-LB; Thu, 22 Oct 2020 04:04:55 -0400 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:40023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVVae-0006vH-HI; Thu, 22 Oct 2020 04:04:55 -0400 Received: by mail-lj1-x241.google.com with SMTP id 23so937572ljv.7; Thu, 22 Oct 2020 01:04:50 -0700 (PDT) Received: from neptune.lab ([46.39.229.104]) by smtp.googlemail.com with ESMTPSA id l8sm143682lfk.203.2020.10.22.01.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2020 01:04: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=O+goKHHTPNQf+byU52c8msGIZZ/A616sN7JzkzNgsEM=; b=eGUGsPqXXOW4Dux81lCwXZwM1fRbvW6bynfQ5kBLRbJHDUxRfzQvNye053UtjvVy+x bbwOdBM52iqmOivy3wOk4U4Dw3OZgWP9z0AelSAH7oGP9DQSfwpze4lkjlO3df9CfaOD kLX3g8rgJ6B72Z8BZVY3oVuHMc69CKDuOXlQGFR7wvisFVhhKRUW5LjfIjmhryod+MTQ xKmABKlgp4y+S2AadW5H0uF4X2Raum2YIWX7FNmVaItIZ+dy4C1yXnchc/qAtelxVIH7 u3UcVRJkkl9Yf5bc3FK8uDxANQF6DwEPxnelZ/QBWnywodqR7o6d67TQ6fGcLFskBzOe 79iw== 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=O+goKHHTPNQf+byU52c8msGIZZ/A616sN7JzkzNgsEM=; b=N9VyUV5fHT6+ACGVPuil47l1yICMoMVY+Z1WB37dUtYBngvdB2WXzGHJC/xvbC9BrC wqiVxdJb4NIW8QTrcD/CeD0IJtq8HsrIUBCJH1LPK3jWigWKjCAW7nhHV+9I0ckqTIk3 BDhdPenMuS5XRMtbfWYSH8+kcSPDcY5LV8AucqGbhXaR9chPWsS/fuP3XBUomnbUQFM+ mv8nIfw/mTmqnnJem5HcAE6foIi82m6hr8StHRKLH7Ut1Kb4EJB+lXsVgZdX6HhF7eTo LP8ziB+w7od6b39wkzdrG1be+t7OEFxVsDgK4YURn1nCg1vAnP7U1v5HEYTVmRmpPxcy 4C7A== X-Gm-Message-State: AOAM532u6hosW67OSqmJuVALhO3Ot5BD8SaqpBLSINRWtyjexg68ZOWH Ww80xv3gHFLFaF/gf9zAIXk= X-Google-Smtp-Source: ABdhPJy+S/GK9tFztX8WGZaPTddrWpZAV8oNJhrMbR7T5pS4yZHmxhB7jZU/TVw6DF2nf/iF7JG06w== X-Received: by 2002:a2e:8702:: with SMTP id m2mr469768lji.21.1603353889363; Thu, 22 Oct 2020 01:04:49 -0700 (PDT) From: Alexey Baturo X-Google-Original-From: Alexey Baturo To: Subject: [PATCH v6 6/6] [RISCV_PM] Allow experimental J-ext to be turned on Date: Thu, 22 Oct 2020 11:04:40 +0300 Message-Id: <20201022080440.10069-7-space.monkey.delivers@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201022080440.10069-1-space.monkey.delivers@gmail.com> References: <20201022080440.10069-1-space.monkey.delivers@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=2a00:1450:4864:20::241; envelope-from=baturo.alexey@gmail.com; helo=mail-lj1-x241.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-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: baturo.alexey@gmail.com, qemu-riscv@nongnu.org, sagark@eecs.berkeley.edu, kbastian@mail.uni-paderborn.de, richard.henderson@linaro.org, qemu-devel@nongnu.org, space.monkey.delivers@gmail.com, Alistair.Francis@wdc.com, kupokupokupopo@gmail.com, palmer@dabbelt.com 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" Signed-off-by: Alexey Baturo --- target/riscv/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 1c00d9ea26..56633c14eb 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -465,6 +465,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error *= *errp) } if (cpu->cfg.ext_j) { env->mmte |=3D PM_EXT_INITIAL; + target_misa |=3D RVJ; } if (cpu->cfg.ext_v) { target_misa |=3D RVV; --=20 2.20.1