From patchwork Fri Aug 28 14:22:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pengpeng Hou X-Patchwork-Id: 2294129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Ir+xwn1A; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4hWgcl6BHDz1xyF for ; Sat, 29 Aug 2026 00:24:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=870kJFHcabk2qvBrMG10wnxyMhe31y9FambihIP8OyQ=; b=Ir+xwn1A7LVqaT iNgEzedeyO08io0TTzFnII3ee3va+nyYER2go1IeqnrmFaPFCC/kOeK78pStQjM56hL4nT10wyQ7k lPH6Hx1/aubdPSuS+hmFAe8K56vFhXN0r6ZJTUM/dyAeg5dYmFto7mQGK0qJU3jT4ldnZEyN7b/Q4 qowX6FvE35JS3AJhSqmlYvd8j8QYI1ydGzSpsgEXzuVz/NWrnZmIaVuxyneDawA27Qk3wDrfHZ7oT gHK+VyyUFSYaxd7kb10qQCNPlZo0hJj3XoQjeRqumauYxVVIDV9pukQ7KNwv0AT7qjqEzH8EY0nU6 vPQSRiwZfH+VwyZpDdSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wzxV1-00000005yQq-1p40; Fri, 28 Aug 2026 14:24:07 +0000 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wzxUv-00000005yPJ-2N2k for opensbi@lists.infradead.org; Fri, 28 Aug 2026 14:24:04 +0000 Received: from localhost.localdomain (unknown [111.196.241.250]) by APP-01 (Coremail) with SMTP id qwCowAC3i+_8mZFq+WPABg--.52138S2; Fri, 28 Aug 2026 22:23:57 +0800 (CST) From: Pengpeng Hou To: opensbi@lists.infradead.org Cc: Pengpeng Hou , Anup Patel , Andrew Jones , Atish Patra , Mayuresh Chitale , Inochi Amaoto Subject: [PATCH] lib: sbi: use unsigned masks for HPM counter 31 Date: Fri, 28 Aug 2026 22:22:30 +0800 Message-ID: <20260828142354.13035-1-pengpeng@iscas.ac.cn> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-CM-TRANSID: qwCowAC3i+_8mZFq+WPABg--.52138S2 X-Coremail-Antispam: 1UD129KBjvJXoW7tr1fAw1fWr4UKryUJr15CFg_yoW8AFW7pr 15WF1DKw40vrs2ka45AwnIqa1rJa18GanrGr97J3yftr1SyFyrur43KrnxtF12qryDAFWU uayFyry093Z5uFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkG14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s 0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xII jxv20xvE14v26r106r15McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr 1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxkF7I0En4kS14v26r12 6r1DMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI 0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y 0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxV W8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1l IxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUvXd8UUU UU= X-Originating-IP: [111.196.241.250] X-CM-SenderInfo: pshqw1xhqjqxpvfd2hldfou0/ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260828_072401_973515_B0D39CD8 X-CRM114-Status: UNSURE ( 8.96 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The HPM feature detector and CSR emulator build mhpm_mask bits with a plain signed 1. Both macro families expand through counter 31, so the last expansion evaluates 1 << 31 and shifts a signed int int [...] Content analysis details: (-4.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [159.226.251.21 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 DMARC_MISSING Missing DMARC policy X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The HPM feature detector and CSR emulator build mhpm_mask bits with a plain signed 1. Both macro families expand through counter 31, so the last expansion evaluates 1 << 31 and shifts a signed int into its sign bit. Use BIT() at both sites. The mask is unsigned and bit 31 is part of the represented HPM counter set. Fixes: c744ed77b18c ("lib: sbi_pmu: Enable noncontigous hpm event and counters") Fixes: ee1f83ca848d ("lib: sbi_pmu: remove mhpm_count field in hart feature") Signed-off-by: Pengpeng Hou --- lib/sbi/sbi_emulate_csr.c | 2 +- lib/sbi/sbi_hart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 4e79fd7de59f1b2899092c1a84ce68c8ebc68f93 diff --git a/lib/sbi/sbi_emulate_csr.c b/lib/sbi/sbi_emulate_csr.c index c2253c82..5d3a6e9d 100644 --- a/lib/sbi/sbi_emulate_csr.c +++ b/lib/sbi/sbi_emulate_csr.c @@ -103,7 +103,7 @@ int sbi_emulate_csr_read(int csr_num, struct sbi_trap_regs *regs, #define switchcase_hpm(__uref, __mref, __csr) \ case __csr: \ - if (sbi_hart_mhpm_mask(scratch) & (1 << (__csr - __uref)))\ + if (sbi_hart_mhpm_mask(scratch) & BIT(__csr - __uref)) \ return SBI_ENOTSUPP; \ if (!hpm_allowed(__csr - __uref, prev_mode, virt)) \ return SBI_ENOTSUPP; \ diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index bee88557..8e4c36d0 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -512,7 +512,7 @@ static int hart_detect_features(struct sbi_scratch *scratch, bool cold_boot) if (!trap.cause) { \ csr_write_allowed(__csr, &trap, 1UL); \ if (!trap.cause && csr_swap(__csr, oldval) == 1UL) { \ - (hfeatures->__mask) |= 1 << (__csr - CSR_MCYCLE); \ + (hfeatures->__mask) |= BIT(__csr - CSR_MCYCLE); \ } \ }