[PATCH 3/7] lib: sbi: Move non-HART PMP functions to sbi_pmp.c
Nicholas Piggin
npiggin at gmail.com
Wed Apr 29 21:55:21 PDT 2026
Create a new file for handling the RISC-V PMP format.
Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
include/sbi/sbi_pmp.h | 22 ++++++++++
lib/sbi/objects.mk | 1 +
lib/sbi/riscv_asm.c | 89 +--------------------------------------
lib/sbi/sbi_pmp.c | 96 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 120 insertions(+), 88 deletions(-)
create mode 100644 include/sbi/sbi_pmp.h
create mode 100644 lib/sbi/sbi_pmp.c
diff --git a/include/sbi/sbi_pmp.h b/include/sbi/sbi_pmp.h
new file mode 100644
index 00000000..66a5cc75
--- /dev/null
+++ b/include/sbi/sbi_pmp.h
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: (c) 2025-2026 Tenstorrent USA, Inc.
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#ifndef __SBI_PMP_H__
+#define __SBI_PMP_H__
+
+#include <sbi/sbi_types.h>
+
+struct pmp {
+ unsigned long addr;
+ u8 cfg;
+};
+typedef struct pmp pmp_t;
+
+int pmp_encode(pmp_t *pmp, unsigned long prot, unsigned long addr,
+ unsigned long log2len);
+int pmp_decode(pmp_t *pmp, unsigned long *prot, unsigned long *addr,
+ unsigned long *log2len);
+
+#endif
diff --git a/lib/sbi/objects.mk b/lib/sbi/objects.mk
index 07d13229..0e29a277 100644
--- a/lib/sbi/objects.mk
+++ b/lib/sbi/objects.mk
@@ -87,6 +87,7 @@ libsbi-objs-y += sbi_init.o
libsbi-objs-y += sbi_ipi.o
libsbi-objs-y += sbi_irqchip.o
libsbi-objs-y += sbi_platform.o
+libsbi-objs-y += sbi_pmp.o
libsbi-objs-y += sbi_pmu.o
libsbi-objs-y += sbi_dbtr.o
libsbi-objs-y += sbi_mpxy.o
diff --git a/lib/sbi/riscv_asm.c b/lib/sbi/riscv_asm.c
index e33e3c36..9b45805c 100644
--- a/lib/sbi/riscv_asm.c
+++ b/lib/sbi/riscv_asm.c
@@ -12,6 +12,7 @@
#include <sbi/sbi_error.h>
#include <sbi/sbi_platform.h>
#include <sbi/sbi_console.h>
+#include <sbi/sbi_pmp.h>
/* determine CPU extension, return non-zero support */
int misa_extension_imp(char ext)
@@ -272,27 +273,6 @@ void csr_write_num(int csr_num, unsigned long val)
#undef switchcase_csr_write
}
-struct pmp {
- unsigned long addr;
- u8 cfg;
-};
-typedef struct pmp pmp_t;
-
-static unsigned long ctz(unsigned long x)
-{
- unsigned long ret = 0;
-
- if (x == 0)
- return 8 * sizeof(x);
-
- while (!(x & 1UL)) {
- ret++;
- x = x >> 1;
- }
-
- return ret;
-}
-
int pmp_disable(unsigned int n)
{
int pmpcfg_csr, pmpcfg_shift;
@@ -336,35 +316,6 @@ int is_pmp_entry_mapped(unsigned long entry)
return false;
}
-static int pmp_encode(pmp_t *pmp, unsigned long prot, unsigned long addr,
- unsigned long log2len)
-{
- /* check parameters */
- if (log2len > __riscv_xlen || log2len < PMP_SHIFT)
- return SBI_EINVAL;
-
- /* encode PMP config */
- prot &= ~PMP_A;
- prot |= (log2len == PMP_SHIFT) ? PMP_A_NA4 : PMP_A_NAPOT;
- pmp->cfg = prot;
-
- /* encode PMP address */
- if (log2len == PMP_SHIFT) {
- pmp->addr = (addr >> PMP_SHIFT);
- } else {
- if (log2len == __riscv_xlen) {
- pmp->addr = -1UL;
- } else {
- unsigned long addrmask;
- addrmask = (1UL << (log2len - PMP_SHIFT)) - 1;
- pmp->addr = ((addr >> PMP_SHIFT) & ~addrmask);
- pmp->addr |= (addrmask >> 1);
- }
- }
-
- return SBI_OK;
-}
-
int pmp_set(unsigned int n, unsigned long prot, unsigned long addr,
unsigned long log2len)
{
@@ -403,44 +354,6 @@ int pmp_set(unsigned int n, unsigned long prot, unsigned long addr,
return 0;
}
-static int pmp_decode(pmp_t *pmp, unsigned long *prot_out, unsigned long *addr_out,
- unsigned long *log2len)
-{
- unsigned long prot;
- unsigned long t1, addr, len;
-
- /* check parameters */
- if (!prot_out || !addr_out || !log2len)
- return SBI_EINVAL;
- *prot_out = *addr_out = *log2len = 0;
-
- /* decode PMP config */
- prot = pmp->cfg;
-
- /* decode PMP address */
- if ((prot & PMP_A) == PMP_A_NAPOT) {
- addr = pmp->addr;
- if (addr == -1UL) {
- addr = 0;
- len = __riscv_xlen;
- } else {
- t1 = ctz(~addr);
- addr = (addr & ~((1UL << t1) - 1)) << PMP_SHIFT;
- len = (t1 + PMP_SHIFT + 1);
- }
- } else {
- addr = pmp->addr << PMP_SHIFT;
- len = PMP_SHIFT;
- }
-
- /* return details */
- *prot_out = prot;
- *addr_out = addr;
- *log2len = len;
-
- return SBI_OK;
-}
-
int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,
unsigned long *log2len)
{
diff --git a/lib/sbi/sbi_pmp.c b/lib/sbi/sbi_pmp.c
new file mode 100644
index 00000000..91eab87f
--- /dev/null
+++ b/lib/sbi/sbi_pmp.c
@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Western Digital Corporation or its affiliates.
+ *
+ * Authors:
+ * Anup Patel <anup.patel at wdc.com>
+ */
+
+#include <sbi/riscv_asm.h>
+#include <sbi/riscv_encoding.h>
+#include <sbi/sbi_error.h>
+#include <sbi/sbi_console.h>
+#include <sbi/sbi_pmp.h>
+
+static unsigned long ctz(unsigned long x)
+{
+ unsigned long ret = 0;
+
+ if (x == 0)
+ return 8 * sizeof(x);
+
+ while (!(x & 1UL)) {
+ ret++;
+ x = x >> 1;
+ }
+
+ return ret;
+}
+
+int pmp_encode(pmp_t *pmp, unsigned long prot, unsigned long addr,
+ unsigned long log2len)
+{
+ /* check parameters */
+ if (log2len > __riscv_xlen || log2len < PMP_SHIFT)
+ return SBI_EINVAL;
+
+ /* encode PMP config */
+ prot &= ~PMP_A;
+ prot |= (log2len == PMP_SHIFT) ? PMP_A_NA4 : PMP_A_NAPOT;
+ pmp->cfg = prot;
+
+ /* encode PMP address */
+ if (log2len == PMP_SHIFT) {
+ pmp->addr = (addr >> PMP_SHIFT);
+ } else {
+ if (log2len == __riscv_xlen) {
+ pmp->addr = -1UL;
+ } else {
+ unsigned long addrmask;
+ addrmask = (1UL << (log2len - PMP_SHIFT)) - 1;
+ pmp->addr = ((addr >> PMP_SHIFT) & ~addrmask);
+ pmp->addr |= (addrmask >> 1);
+ }
+ }
+
+ return SBI_OK;
+}
+
+int pmp_decode(pmp_t *pmp, unsigned long *prot_out, unsigned long *addr_out,
+ unsigned long *log2len)
+{
+ unsigned long prot;
+ unsigned long t1, addr, len;
+
+ /* check parameters */
+ if (!prot_out || !addr_out || !log2len)
+ return SBI_EINVAL;
+ *prot_out = *addr_out = *log2len = 0;
+
+ /* decode PMP config */
+ prot = pmp->cfg;
+
+ /* decode PMP address */
+ if ((prot & PMP_A) == PMP_A_NAPOT) {
+ addr = pmp->addr;
+ if (addr == -1UL) {
+ addr = 0;
+ len = __riscv_xlen;
+ } else {
+ t1 = ctz(~addr);
+ addr = (addr & ~((1UL << t1) - 1)) << PMP_SHIFT;
+ len = (t1 + PMP_SHIFT + 1);
+ }
+ } else {
+ addr = pmp->addr << PMP_SHIFT;
+ len = PMP_SHIFT;
+ }
+
+ /* return details */
+ *prot_out = prot;
+ *addr_out = addr;
+ *log2len = len;
+
+ return SBI_OK;
+}
--
2.53.0
More information about the opensbi
mailing list