Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2230811/?format=api
{ "id": 2230811, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2230811/?format=api", "web_url": "http://patchwork.ozlabs.org/project/opensbi/patch/20260430045528.420437-3-npiggin@gmail.com/", "project": { "id": 67, "url": "http://patchwork.ozlabs.org/api/1.1/projects/67/?format=api", "name": "OpenSBI development", "link_name": "opensbi", "list_id": "opensbi.lists.infradead.org", "list_email": "opensbi@lists.infradead.org", "web_url": "https://github.com/riscv/opensbi", "scm_url": "", "webscm_url": "" }, "msgid": "<20260430045528.420437-3-npiggin@gmail.com>", "date": "2026-04-30T04:55:19", "name": "[2/7] lib: sbi: split PMP encoding and CSR access", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1e2275b2397c4cfba0f766fade02cf9212856235", "submitter": { "id": 69518, "url": "http://patchwork.ozlabs.org/api/1.1/people/69518/?format=api", "name": "Nicholas Piggin", "email": "npiggin@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/opensbi/patch/20260430045528.420437-3-npiggin@gmail.com/mbox/", "series": [ { "id": 502193, "url": "http://patchwork.ozlabs.org/api/1.1/series/502193/?format=api", "web_url": "http://patchwork.ozlabs.org/project/opensbi/list/?series=502193", "date": "2026-04-30T04:55:18", "name": "Make PMP encoding usable for non-hart PMPs", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/502193/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2230811/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2230811/checks/", "tags": {}, "headers": { "Return-Path": "\n <opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=bhI8tzVX;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=sjP5fpO4;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5hhG4WlGz1yK1\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 30 Apr 2026 14:55:56 +1000 (AEST)", "from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wIJRF-00000004g4y-0e24;\n\tThu, 30 Apr 2026 04:55:49 +0000", "from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wIJRC-00000004g41-3dEV\n\tfor opensbi@lists.infradead.org;\n\tThu, 30 Apr 2026 04:55:47 +0000", "by mail-pj1-x102f.google.com with SMTP id\n 98e67ed59e1d1-362e30526f8so186378a91.3\n for <opensbi@lists.infradead.org>;\n Wed, 29 Apr 2026 21:55:46 -0700 (PDT)", "from localhost ([124.158.97.178])\n by smtp.gmail.com with ESMTPSA id\n 98e67ed59e1d1-364be00b168sm1245524a91.12.2026.04.29.21.55.44\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 29 Apr 2026 21:55:44 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=Ak23gEq5SYtpPu47vzXmsnYE51LESIZ4YaipvWx/xtQ=; b=bhI8tzVXoianJ6\n\tCUD8PJNBkAIwIYQEJKHvITXvo9jBNu5ZVffekU+fGwd27D0waywMNy7ogj10OH3YgiB4RJsj9nzf6\n\t2cddLYk/NxZeO5THy02B5F/NAdv4lcmWe2jOQh4db6EVVeb/LKF+TElI8kUHqK9mcNTdG3J9jve3p\n\tifjFvQt0UeX0HDaQJLyt1F9MV7ON61MtUOagvr+LnaS65jlAIPxmzM1L9pe1P4BHxKPGojCUYRcTn\n\twZEXQ33PKv9nFCVp225869NF8O0JoNhZVzmlZnFeptECQNnqTejhOOAJDnZ/q8ugOaFMla3SNoq5Z\n\tbPlhLdDxKUcjl9ggJb0w==;", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1777524945; x=1778129745;\n darn=lists.infradead.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=2ro9xvv1ROICGclp3fS2EhmhM42xM78dx6XTJNFMixs=;\n b=sjP5fpO49Fw5LMi8mzzcYz5+GrNVARhGtyZx55o4WyfIkd9UOd+5KCk8Y4E0nyDrsK\n dcU0ZDdHHJEYmVFO3swmpnKsK/P6EUsuWg4kK51Wd5HhJn0BVmSINJj3DLCFrSaaPO7g\n 5/Ej9uPy6XOnbazEQ63vkh1+tpwz7YBoguqv/Er7Yz0U0Z5Q2aKUnTOGQ2VB48eoZJlS\n W+klg6aNWqhiReWSH1/IRRqSmcskyZLKGcVtjzYbuwvIgplTgtqwyqmGU++hQU0loBXp\n fbc0c+tNaEbfr5TiKC8n7BxN4+WpftBzyEndNsGcEdw8YQkshrDdUBiHvweJvl+q/z8k\n GcXQ==" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777524945; x=1778129745;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=2ro9xvv1ROICGclp3fS2EhmhM42xM78dx6XTJNFMixs=;\n b=ruPfjANeFZjkM39J2fJmxpQTrK40xUn+aEz5FB2434Nj6ewwLLDRzQgRHjZGO29OqP\n MQDLauCXeEeWpeTUtIYUozISfOyxwDr97wDLJBhuJepxE4xxqTadXHmGBiw6BljwAKP5\n sGm9+gbmnWwp6Cg7IX33D9RAeQ0gsRvo6sUC2+UC7ZppYgmWnhHApG3gIwfulkBeuKzW\n lubwF8diz2VvjCpKb5VUTiL5m5kajdY7I62UvS5p9k+NpUxxTU2gj1pjNtXH9Z0r0zOf\n mWHeTFqb/3G8CR7kUOR1ADvVC9O5unZGWPuZjU/8QHQAPNr+UmhbETJcAg3F3xAcOeq9\n WurQ==", "X-Gm-Message-State": "AOJu0YyLrFYIPxO3tVLGHo7V7FKbIM/8UUzXnCPYPKfnvyVYRhhZ0uVD\n\tvgTHWJwUqf3Yx+BQl1cadAzc89No9Fpjye5qM2SIhGFn7cp+6a1zHSkFShdTew==", "X-Gm-Gg": "AeBDietYKh9oVEBk4kbjotRTolKJTBK77SZMff9anSYZl+Tsjv2azAcEExMCcfJlw2S\n\tuTSynldCh/1iugW7z9pTUt1fEUviqOHcbw7ZGcx7D7MJKzG4wPAi2uxVszbooStfJIsgxErQHba\n\t/mAiUlCvDvBwZLdRbFM40Ra+/rZQUhN2ezCJtJa3LoYeLH1k4z+6X0fehRG9EZNjgLIANuvNB6l\n\t2isHa2wsOT69QqLqMInu3OxRrJy/jkPToCtCjWPpEBHMixxiBVp+KzcvLE7twAOUb4Yxq2s80u5\n\tE0xFldn/gZBN93GtYygSj068QwXeaj+nc0O3hfcwXGk5HvAy/CWp33W9ftVKZa5pqmv0La+XQ/K\n\ti2HXk43qKD4R+byostJ0o+CCeytbIYnThfev1JW1D0FjXSlqAES9ELYbu0S6ezKpxNV0/1xGApD\n\toVVSz9CI9+qcl88MXzRNx1Lr7OaGzd6rz100XgSEaOE6o=", "X-Received": "by 2002:a17:90b:5830:b0:35f:b1f3:ac12 with SMTP id\n 98e67ed59e1d1-364c2f23000mr1376483a91.4.1777524945385;\n Wed, 29 Apr 2026 21:55:45 -0700 (PDT)", "From": "Nicholas Piggin <npiggin@gmail.com>", "To": "opensbi@lists.infradead.org", "Cc": "Nicholas Piggin <npiggin@gmail.com>", "Subject": "[PATCH 2/7] lib: sbi: split PMP encoding and CSR access", "Date": "Thu, 30 Apr 2026 14:55:19 +1000", "Message-ID": "<20260430045528.420437-3-npiggin@gmail.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260430045528.420437-1-npiggin@gmail.com>", "References": "<20260430045528.420437-1-npiggin@gmail.com>", "MIME-Version": "1.0", "X-CRM114-Version": "20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ", "X-CRM114-CacheID": "sfid-20260429_215546_911215_4B5B92FE ", "X-CRM114-Status": "GOOD ( 14.39 )", "X-Spam-Score": "-2.1 (--)", "X-Spam-Report": "Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: Allow PMP encoding functions to be shared with non-hart PMP\n manipulation by splitting encoding / decoding and hart PMP CSR access into\n their own functions. Signed-off-by: Nicholas Piggin ---\n lib/sbi/riscv_asm.c\n | 119 +++++++++++++++++++++++++++ 1 file changed, 73 insertions(+),\n 46 deletions(-) \n Content analysis details: (-2.1 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no\n trust\n [2607:f8b0:4864:20:0:0:0:102f listed in]\n [list.dnswl.org]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from\n envelope-from domain\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\n provider\n [npiggin(at)gmail.com]", "X-BeenThere": "opensbi@lists.infradead.org", "X-Mailman-Version": "2.1.34", "Precedence": "list", "List-Id": "<opensbi.lists.infradead.org>", "List-Unsubscribe": "<http://lists.infradead.org/mailman/options/opensbi>,\n <mailto:opensbi-request@lists.infradead.org?subject=unsubscribe>", "List-Archive": "<http://lists.infradead.org/pipermail/opensbi/>", "List-Post": "<mailto:opensbi@lists.infradead.org>", "List-Help": "<mailto:opensbi-request@lists.infradead.org?subject=help>", "List-Subscribe": "<http://lists.infradead.org/mailman/listinfo/opensbi>,\n <mailto:opensbi-request@lists.infradead.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "\"opensbi\" <opensbi-bounces@lists.infradead.org>", "Errors-To": "opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org" }, "content": "Allow PMP encoding functions to be shared with non-hart PMP manipulation\nby splitting encoding / decoding and hart PMP CSR access into their own\nfunctions.\n\nSigned-off-by: Nicholas Piggin <npiggin@gmail.com>\n---\n lib/sbi/riscv_asm.c | 119 +++++++++++++++++++++++++++-----------------\n 1 file changed, 73 insertions(+), 46 deletions(-)", "diff": "diff --git a/lib/sbi/riscv_asm.c b/lib/sbi/riscv_asm.c\nindex acb6b5e6..e33e3c36 100644\n--- a/lib/sbi/riscv_asm.c\n+++ b/lib/sbi/riscv_asm.c\n@@ -336,70 +336,50 @@ int is_pmp_entry_mapped(unsigned long entry)\n \treturn false;\n }\n \n-int pmp_set(unsigned int n, unsigned long prot, unsigned long addr,\n-\t unsigned long log2len)\n+static int pmp_encode(pmp_t *pmp, unsigned long prot, unsigned long addr,\n+\t\t unsigned long log2len)\n {\n-\tint pmpcfg_csr, pmpcfg_shift, pmpaddr_csr;\n-\tunsigned long cfgmask, pmpcfg;\n-\tunsigned long addrmask;\n-\tpmp_t pmp;\n-\n \t/* check parameters */\n-\tif (n >= PMP_COUNT || log2len > __riscv_xlen || log2len < PMP_SHIFT)\n+\tif (log2len > __riscv_xlen || log2len < PMP_SHIFT)\n \t\treturn SBI_EINVAL;\n \n-\t/* calculate PMP register and offset */\n-#if __riscv_xlen == 32\n-\tpmpcfg_csr = CSR_PMPCFG0 + (n >> 2);\n-\tpmpcfg_shift = (n & 3) << 3;\n-#elif __riscv_xlen == 64\n-\tpmpcfg_csr = (CSR_PMPCFG0 + (n >> 2)) & ~1;\n-\tpmpcfg_shift = (n & 7) << 3;\n-#else\n-# error \"Unexpected __riscv_xlen\"\n-#endif\n-\tpmpaddr_csr = CSR_PMPADDR0 + n;\n-\n \t/* encode PMP config */\n \tprot &= ~PMP_A;\n \tprot |= (log2len == PMP_SHIFT) ? PMP_A_NA4 : PMP_A_NAPOT;\n-\tpmp.cfg = prot;\n+\tpmp->cfg = prot;\n \n \t/* encode PMP address */\n \tif (log2len == PMP_SHIFT) {\n-\t\tpmp.addr = (addr >> PMP_SHIFT);\n+\t\tpmp->addr = (addr >> PMP_SHIFT);\n \t} else {\n \t\tif (log2len == __riscv_xlen) {\n-\t\t\tpmp.addr = -1UL;\n+\t\t\tpmp->addr = -1UL;\n \t\t} else {\n+\t\t\tunsigned long addrmask;\n \t\t\taddrmask = (1UL << (log2len - PMP_SHIFT)) - 1;\n-\t\t\tpmp.addr = ((addr >> PMP_SHIFT) & ~addrmask);\n-\t\t\tpmp.addr |= (addrmask >> 1);\n+\t\t\tpmp->addr = ((addr >> PMP_SHIFT) & ~addrmask);\n+\t\t\tpmp->addr |= (addrmask >> 1);\n \t\t}\n \t}\n \n-\t/* write csrs */\n-\tcsr_write_num(pmpaddr_csr, pmp.addr);\n-\tcfgmask = ~(0xffUL << pmpcfg_shift);\n-\tpmpcfg = (csr_read_num(pmpcfg_csr) & cfgmask);\n-\tpmpcfg |= (((unsigned long)pmp.cfg << pmpcfg_shift) & ~cfgmask);\n-\tcsr_write_num(pmpcfg_csr, pmpcfg);\n-\n-\treturn 0;\n+\treturn SBI_OK;\n }\n \n-int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,\n-\t unsigned long *log2len)\n+int pmp_set(unsigned int n, unsigned long prot, unsigned long addr,\n+\t unsigned long log2len)\n {\n \tint pmpcfg_csr, pmpcfg_shift, pmpaddr_csr;\n-\tunsigned long cfgmask, prot;\n-\tunsigned long t1, addr, len;\n+\tunsigned long cfgmask, pmpcfg;\n \tpmp_t pmp;\n+\tint rc;\n \n \t/* check parameters */\n-\tif (n >= PMP_COUNT || !prot_out || !addr_out || !log2len)\n+\tif (n >= PMP_COUNT)\n \t\treturn SBI_EINVAL;\n-\t*prot_out = *addr_out = *log2len = 0;\n+\n+\trc = pmp_encode(&pmp, prot, addr, log2len);\n+\tif (rc)\n+\t\treturn rc;\n \n \t/* calculate PMP register and offset */\n #if __riscv_xlen == 32\n@@ -413,16 +393,33 @@ int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,\n #endif\n \tpmpaddr_csr = CSR_PMPADDR0 + n;\n \n-\tcfgmask = (0xffUL << pmpcfg_shift);\n-\tpmp.cfg = (csr_read_num(pmpcfg_csr) & cfgmask) >> pmpcfg_shift;\n-\tpmp.addr = csr_read_num(pmpaddr_csr);\n+\t/* write csrs */\n+\tcsr_write_num(pmpaddr_csr, pmp.addr);\n+\tcfgmask = ~(0xffUL << pmpcfg_shift);\n+\tpmpcfg = (csr_read_num(pmpcfg_csr) & cfgmask);\n+\tpmpcfg |= (((unsigned long)pmp.cfg << pmpcfg_shift) & ~cfgmask);\n+\tcsr_write_num(pmpcfg_csr, pmpcfg);\n+\n+\treturn 0;\n+}\n+\n+static int pmp_decode(pmp_t *pmp, unsigned long *prot_out, unsigned long *addr_out,\n+\t\t unsigned long *log2len)\n+{\n+\tunsigned long prot;\n+\tunsigned long t1, addr, len;\n+\n+\t/* check parameters */\n+\tif (!prot_out || !addr_out || !log2len)\n+\t\treturn SBI_EINVAL;\n+\t*prot_out = *addr_out = *log2len = 0;\n \n \t/* decode PMP config */\n-\tprot = pmp.cfg;\n+\tprot = pmp->cfg;\n \n \t/* decode PMP address */\n \tif ((prot & PMP_A) == PMP_A_NAPOT) {\n-\t\taddr = pmp.addr;\n+\t\taddr = pmp->addr;\n \t\tif (addr == -1UL) {\n \t\t\taddr\t= 0;\n \t\t\tlen\t= __riscv_xlen;\n@@ -432,7 +429,7 @@ int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,\n \t\t\tlen\t= (t1 + PMP_SHIFT + 1);\n \t\t}\n \t} else {\n-\t\taddr\t= pmp.addr << PMP_SHIFT;\n+\t\taddr\t= pmp->addr << PMP_SHIFT;\n \t\tlen\t= PMP_SHIFT;\n \t}\n \n@@ -441,5 +438,35 @@ int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,\n \t*addr_out = addr;\n \t*log2len = len;\n \n-\treturn 0;\n+\treturn SBI_OK;\n+}\n+\n+int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,\n+\t unsigned long *log2len)\n+{\n+\tint pmpcfg_csr, pmpcfg_shift, pmpaddr_csr;\n+\tunsigned long cfgmask;\n+\tpmp_t pmp;\n+\n+\t/* check parameters */\n+\tif (n >= PMP_COUNT)\n+\t\treturn SBI_EINVAL;\n+\n+\t/* calculate PMP register and offset */\n+#if __riscv_xlen == 32\n+\tpmpcfg_csr = CSR_PMPCFG0 + (n >> 2);\n+\tpmpcfg_shift = (n & 3) << 3;\n+#elif __riscv_xlen == 64\n+\tpmpcfg_csr = (CSR_PMPCFG0 + (n >> 2)) & ~1;\n+\tpmpcfg_shift = (n & 7) << 3;\n+#else\n+# error \"Unexpected __riscv_xlen\"\n+#endif\n+\tpmpaddr_csr = CSR_PMPADDR0 + n;\n+\n+\tcfgmask = (0xffUL << pmpcfg_shift);\n+\tpmp.cfg = (csr_read_num(pmpcfg_csr) & cfgmask) >> pmpcfg_shift;\n+\tpmp.addr = csr_read_num(pmpaddr_csr);\n+\n+\treturn pmp_decode(&pmp, prot_out, addr_out, log2len);\n }\n", "prefixes": [ "2/7" ] }