From patchwork Wed Aug 14 13:01:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Runmin X-Patchwork-Id: 1972417 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=ROoXDhUW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) 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 4WkT1T1JzSz1yZl for ; Wed, 14 Aug 2024 23:02:21 +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:References:In-Reply-To: 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: List-Owner; bh=+7y+bJUG5jWGtiJuvdy9pe4Wuiy+vkNdBieZawmhQtU=; b=ROoXDhUWZEk655 ITvarL4xJWgjrjMsjtk/tLNoiMQ0RKOXiSDG2YCQwfLicydm1HbEjla05qpq0055orIeN1ccMRZwL ze9pcutO0k+NntURW4Yl1/eL7oAI8FU2G8Zcic+9UiHu4pPqMqB9gMobUSzmO7eppciKzN63zXgej V7kJBoaCsDjXNeXr+b8lyiakK3yxpKUaf13OvAmhHFv0/LZ8WZcLj1cNQzyKdT9ut2Yudbks+cia7 jCDnJwqyj/ldnR7rH5iqXxQY9YK1cgNkafaKiGcKIxSBXf4sgGYkoZ8ONH7z+ENVdqcIM8s0ohlnQ 6+YM/tqYgSpPlTgCS8Rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seDdk-000000071s9-0xMp; Wed, 14 Aug 2024 13:02:12 +0000 Received: from mail.ingenic.cn ([106.37.171.196] helo=mail.ingenic.com) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seDde-000000071rX-4B5G for opensbi@lists.infradead.org; Wed, 14 Aug 2024 13:02:08 +0000 Received: from localhost.localdomain (unknown [47.122.17.1]) by mail.ingenic.com (Postfix) with ESMTPA id 85A952700464; Wed, 14 Aug 2024 21:01:59 +0800 (CST) From: Zhang Runmin To: opensbi@lists.infradead.org Cc: wxjstz@126.com, Zhang RunMin Subject: [PATCHv2] lib: Delete redundant `ulong` Date: Wed, 14 Aug 2024 21:01:47 +0800 Message-Id: <6c54d5461bc49b803c8d00552c56f46d2bb77744.1723640100.git.runmin.zhang@ingenic.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <5e68a847e2e53db899336ca73b831247a6b817c3.camel@126.com> References: <5e68a847e2e53db899336ca73b831247a6b817c3.camel@126.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240814_060207_229088_C02D853A X-CRM114-Status: GOOD ( 12.11 ) X-Spam-Score: -1.9 (-) 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: From: Zhang RunMin In `csr_read_allowed` and `csr_write_allowed` macros, has already converted second param to `ulong`. So delete redundant `ulong` where uses csr_read/write_allowed macros. Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [106.37.171.196 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [106.37.171.196 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [106.37.171.196 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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 T_SCC_BODY_TEXT_LINE No description available. 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 From: Zhang RunMin In `csr_read_allowed` and `csr_write_allowed` macros, has already converted second param to `ulong`. So delete redundant `ulong` where uses csr_read/write_allowed macros. Signed-off-by: Zhang RunMin --- v2: - Fix similar problems in: lib/sbi/sbi_hart.c lib/utils/irqchip/imsic.c v1: - Delete redundant ulong in: lib/sbi/sbi_dbtr.c --- lib/sbi/sbi_dbtr.c | 9 +++++---- lib/sbi/sbi_hart.c | 26 +++++++++++++------------- lib/utils/irqchip/imsic.c | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/lib/sbi/sbi_dbtr.c b/lib/sbi/sbi_dbtr.c index 27a8b91..60c37b4 100644 --- a/lib/sbi/sbi_dbtr.c +++ b/lib/sbi/sbi_dbtr.c @@ -167,11 +167,12 @@ int sbi_dbtr_init(struct sbi_scratch *scratch, bool coldboot) goto _probed; for (i = 0; i < RV_MAX_TRIGGERS; i++) { - csr_write_allowed(CSR_TSELECT, (ulong)&trap, i); + // CSR_TESLECT 0x7a0 + csr_write_allowed(CSR_TSELECT, &trap, i); if (trap.cause) break; - val = csr_read_allowed(CSR_TSELECT, (ulong)&trap); + val = csr_read_allowed(CSR_TSELECT, &trap); if (trap.cause) break; @@ -182,7 +183,7 @@ int sbi_dbtr_init(struct sbi_scratch *scratch, bool coldboot) if (val != i) break; - val = csr_read_allowed(CSR_TINFO, (ulong)&trap); + val = csr_read_allowed(CSR_TINFO, &trap); if (trap.cause) { /* * If reading tinfo caused an exception, the @@ -190,7 +191,7 @@ int sbi_dbtr_init(struct sbi_scratch *scratch, bool coldboot) * type. */ tdata1 = csr_read_allowed(CSR_TDATA1, - (ulong)&trap); + &trap); if (trap.cause) break; diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index c366701..44c6eac 100644 --- a/lib/sbi/sbi_hart.c +++ b/lib/sbi/sbi_hart.c @@ -723,13 +723,13 @@ static unsigned long hart_pmp_get_allowed_addr(void) unsigned long val = 0; struct sbi_trap_info trap = {0}; - csr_write_allowed(CSR_PMPCFG0, (ulong)&trap, 0); + csr_write_allowed(CSR_PMPCFG0, &trap, 0); if (trap.cause) return 0; - csr_write_allowed(CSR_PMPADDR0, (ulong)&trap, PMP_ADDR_MASK); + csr_write_allowed(CSR_PMPADDR0, &trap, PMP_ADDR_MASK); if (!trap.cause) { - val = csr_read_allowed(CSR_PMPADDR0, (ulong)&trap); + val = csr_read_allowed(CSR_PMPADDR0, &trap); if (trap.cause) val = 0; } @@ -747,17 +747,17 @@ static int hart_mhpm_get_allowed_bits(void) * It is assumed that platforms will implement same number of bits for * all the performance counters including mcycle/minstret. */ - csr_write_allowed(CSR_MHPMCOUNTER3, (ulong)&trap, val); + csr_write_allowed(CSR_MHPMCOUNTER3, &trap, val); if (!trap.cause) { - val = csr_read_allowed(CSR_MHPMCOUNTER3, (ulong)&trap); + val = csr_read_allowed(CSR_MHPMCOUNTER3, &trap); if (trap.cause) return 0; } num_bits = sbi_fls(val) + 1; #if __riscv_xlen == 32 - csr_write_allowed(CSR_MHPMCOUNTER3H, (ulong)&trap, val); + csr_write_allowed(CSR_MHPMCOUNTER3H, &trap, val); if (!trap.cause) { - val = csr_read_allowed(CSR_MHPMCOUNTER3H, (ulong)&trap); + val = csr_read_allowed(CSR_MHPMCOUNTER3H, &trap); if (trap.cause) return num_bits; } @@ -788,9 +788,9 @@ static int hart_detect_features(struct sbi_scratch *scratch) hfeatures->priv_version = SBI_HART_PRIV_VER_UNKNOWN; #define __check_hpm_csr(__csr, __mask) \ - oldval = csr_read_allowed(__csr, (ulong)&trap); \ + oldval = csr_read_allowed(__csr, &trap); \ if (!trap.cause) { \ - csr_write_allowed(__csr, (ulong)&trap, 1UL); \ + csr_write_allowed(__csr, &trap, 1UL); \ if (!trap.cause && csr_swap(__csr, oldval) == 1UL) { \ (hfeatures->__mask) |= 1 << (__csr - CSR_MCYCLE); \ } \ @@ -810,12 +810,12 @@ static int hart_detect_features(struct sbi_scratch *scratch) __check_hpm_csr_8(__csr + 8, __mask) #define __check_csr(__csr, __rdonly, __wrval, __field, __skip) \ - oldval = csr_read_allowed(__csr, (ulong)&trap); \ + oldval = csr_read_allowed(__csr, &trap); \ if (!trap.cause) { \ if (__rdonly) { \ (hfeatures->__field)++; \ } else { \ - csr_write_allowed(__csr, (ulong)&trap, __wrval);\ + csr_write_allowed(__csr, &trap, __wrval);\ if (!trap.cause) { \ if (csr_swap(__csr, oldval) == __wrval) \ (hfeatures->__field)++; \ @@ -880,7 +880,7 @@ __pmp_skip: #define __check_priv(__csr, __base_priv, __priv) \ - val = csr_read_allowed(__csr, (ulong)&trap); \ + val = csr_read_allowed(__csr, &trap); \ if (!trap.cause && (hfeatures->priv_version >= __base_priv)) { \ hfeatures->priv_version = __priv; \ } @@ -899,7 +899,7 @@ __pmp_skip: #define __check_ext_csr(__base_priv, __csr, __ext) \ if (hfeatures->priv_version >= __base_priv) { \ - csr_read_allowed(__csr, (ulong)&trap); \ + csr_read_allowed(__csr, &trap); \ if (!trap.cause) \ __sbi_hart_update_extension(hfeatures, \ __ext, true); \ diff --git a/lib/utils/irqchip/imsic.c b/lib/utils/irqchip/imsic.c index 7d6993e..bac72d2 100644 --- a/lib/utils/irqchip/imsic.c +++ b/lib/utils/irqchip/imsic.c @@ -241,7 +241,7 @@ void imsic_local_irqchip_init(void) */ /* If Smaia not available then do nothing */ - csr_read_allowed(CSR_MTOPI, (ulong)&trap); + csr_read_allowed(CSR_MTOPI, &trap); if (trap.cause) return;