From patchwork Fri May 3 13:53:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1931040 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=ujx4epYQ; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.a=rsa-sha256 header.s=s110527 header.b=T/e/WMNr; 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 4VWC3j22cPz20fb for ; Fri, 3 May 2024 23:54:57 +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=71oEI57xzYxnw53vK646IUFunlURIKpcjQFdjnpmMao=; b=ujx4epYQnKMMVe NI9fv7b0BOlGNvmKs21P+kx004oLT+MzsE8w+68ca9Z6tFriWePNpSkoqjZsKdwufK5HTmsZyt2Yw 3iErqATH4hBdlF2885pz0bFJUPI0osuj8IvDbgBAJm/HtWfVmXa2zIuWWeg8Q3rEJXMZG43bDRlQh 67KcgfwAhy92/z8oqHBOa52jLibNNfl1/+HQvwdSb2yG1uvPIKqDIM0PjHPKpWptYhsh3dXE8reKZ EXPC/fXGKxO6ygVQNZdG38txznXOUlSgQgYIYnZCoWUsLswA3UtGnaVBASwiBdMuSXFArAFjtORaA wtGevqR3xzW8aoyxknvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2tND-0000000Gk5k-0sOU; Fri, 03 May 2024 13:54:51 +0000 Received: from m16.mail.126.com ([220.197.31.9]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2tN9-0000000Gk3A-3C1y for opensbi@lists.infradead.org; Fri, 03 May 2024 13:54:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=2ePLY B3vZavRNAgpSKSPN5+hT5j3kD8ljoM37+VGAGA=; b=T/e/WMNrO48kTU0sLuyw6 Hjj9YMMzoHDA3sQTJ6kzqMkb5V5v3ifc6SHIiBHJJyXTXlLXjH2Ufo9qYdNzzGB0 qaZ2NgMmxA3RYYEAUY5sV3OODmRAGnP6UKwW6+n3oihI8w82xPn+EkaHp42BP9a0 yPN53Gx69CQjDvgVRZ0HHQ= Received: from T490.lan (unknown [36.153.54.93]) by gzga-smtp-mta-g1-5 (Coremail) with SMTP id _____wDnL3Fl7DRmyPi6Bg--.47168S8; Fri, 03 May 2024 21:53:47 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W , hchauhan@ventanamicro.com, anup@brainfault.org Subject: [PATCH v3 6/6] lib: sbi: simplify inline function in sbi_dtbr.c Date: Fri, 3 May 2024 21:53:38 +0800 Message-ID: <20240503135340.310030-7-wxjstz@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240503135340.310030-1-wxjstz@126.com> References: <20240503135340.310030-1-wxjstz@126.com> MIME-Version: 1.0 X-CM-TRANSID: _____wDnL3Fl7DRmyPi6Bg--.47168S8 X-Coremail-Antispam: 1Uf129KBjvJXoW3XryktF4xXFyxWF1xGr43GFg_yoW7XFyDpF Z3uFWxtrsFqry0yFW7J3W8W345Kr4xJa45K3s8CF95Aas8Zr1rJr13tw1qvFyfJry8Wa42 yw40yFW7uF43tF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziqXHiUUUUU= X-Originating-IP: [36.153.54.93] X-CM-SenderInfo: pz0m23b26rjloofrz/xtbBdAvTOmSdL5OEgQABsX X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240503_065448_243226_5BE257C8 X-CRM114-Status: GOOD ( 11.75 ) X-Spam-Score: -0.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 inline function can simplify the code by setting some call restrictions. This ensures logical smoothness Signed-off-by: Xiang W --- lib/sbi/sbi_dbtr.c | 78 +++++++++++++++++++ 1 file changed, 32 insertions(+), 46 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [220.197.31.9 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [wxjstz(at)126.com] 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 inline function can simplify the code by setting some call restrictions. This ensures logical smoothness Signed-off-by: Xiang W Reviewed-by: Anup Patel --- lib/sbi/sbi_dbtr.c | 78 +++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/lib/sbi/sbi_dbtr.c b/lib/sbi/sbi_dbtr.c index 6950378..9c92af6 100644 --- a/lib/sbi/sbi_dbtr.c +++ b/lib/sbi/sbi_dbtr.c @@ -55,49 +55,29 @@ static unsigned long hart_state_ptr_offset; #error "Undefined XLEN" #endif -static inline bool sbi_dbtr_shmem_disabled(void) +/* must call with hs != NULL */ +static inline bool sbi_dbtr_shmem_disabled( + struct sbi_dbtr_hart_triggers_state *hs) { - struct sbi_dbtr_hart_triggers_state *hs = NULL; - - hs = dbtr_get_hart_state_ptr(sbi_scratch_thishart_ptr()); - - if (!hs) - return true; - return (hs->shmem.phys_lo == SBI_DBTR_SHMEM_INVALID_ADDR && hs->shmem.phys_hi == SBI_DBTR_SHMEM_INVALID_ADDR ? true : false); } -static inline void sbi_dbtr_disable_shmem(void) +/* must call with hs != NULL */ +static inline void sbi_dbtr_disable_shmem( + struct sbi_dbtr_hart_triggers_state *hs) { - struct sbi_dbtr_hart_triggers_state *hs = NULL; - - hs = dbtr_get_hart_state_ptr(sbi_scratch_thishart_ptr()); - - if (!hs) - return; - hs->shmem.phys_lo = SBI_DBTR_SHMEM_INVALID_ADDR; hs->shmem.phys_hi = SBI_DBTR_SHMEM_INVALID_ADDR; } -static inline void *hart_shmem_base(void) +/* must call with hs which is not disabled */ +static inline void *hart_shmem_base( + struct sbi_dbtr_hart_triggers_state *hs) { - unsigned long phys_hi, phys_lo; - struct sbi_dbtr_hart_triggers_state *hs = NULL; - - hs = dbtr_get_hart_state_ptr(sbi_scratch_thishart_ptr()); - if (!hs) - return NULL; - - phys_hi = hs->shmem.phys_hi; - phys_lo = hs->shmem.phys_lo; - - if (phys_hi == SBI_DBTR_SHMEM_INVALID_ADDR && phys_hi == phys_lo) - return NULL; - - return ((void *)(unsigned long)DBTR_SHMEM_MAKE_PHYS(phys_hi, phys_lo)); + return ((void *)(unsigned long)DBTR_SHMEM_MAKE_PHYS( + hs->shmem.phys_hi, hs->shmem.phys_lo)); } static void sbi_trigger_init(struct sbi_dbtr_trigger *trig, @@ -186,7 +166,7 @@ int sbi_dbtr_init(struct sbi_scratch *scratch, bool coldboot) } /* disable the shared memory */ - sbi_dbtr_disable_shmem(); + sbi_dbtr_disable_shmem(hart_state); /* Skip probing triggers if already probed */ if (hart_state->probed) @@ -278,15 +258,19 @@ int sbi_dbtr_setup_shmem(const struct sbi_domain *dom, unsigned long smode, return SBI_ERR_DENIED; } + hart_state = dbtr_thishart_state_ptr(); + if (!hart_state) + return SBI_ERR_FAILED; + /* call is to disable shared memory */ if (shmem_phys_lo == SBI_DBTR_SHMEM_INVALID_ADDR && shmem_phys_hi == SBI_DBTR_SHMEM_INVALID_ADDR) { - sbi_dbtr_disable_shmem(); + sbi_dbtr_disable_shmem(hart_state); return SBI_SUCCESS; } /* the shared memory must be disabled on this hart */ - if (!sbi_dbtr_shmem_disabled()) + if (!sbi_dbtr_shmem_disabled(hart_state)) return SBI_ERR_ALREADY_AVAILABLE; /* lower physical address must be XLEN/8 bytes aligned */ @@ -298,10 +282,6 @@ int sbi_dbtr_setup_shmem(const struct sbi_domain *dom, unsigned long smode, SBI_DOMAIN_READ | SBI_DOMAIN_WRITE)) return SBI_ERR_INVALID_ADDRESS; - hart_state = dbtr_thishart_state_ptr(); - if (!hart_state) - return SBI_ERR_FAILED; - hart_state->shmem.phys_lo = shmem_phys_lo; hart_state->shmem.phys_hi = shmem_phys_hi; @@ -531,10 +511,10 @@ int sbi_dbtr_read_trig(unsigned long smode, trig_idx_base + trig_count >= hs->total_trigs) return SBI_ERR_INVALID_PARAM; - if (sbi_dbtr_shmem_disabled()) + if (sbi_dbtr_shmem_disabled(hs)) return SBI_ERR_NO_SHMEM; - shmem_base = hart_shmem_base(); + shmem_base = hart_shmem_base(hs); for_each_trig_entry(shmem_base, trig_count, typeof(*entry), entry) { sbi_hart_map_saddr((unsigned long)entry, sizeof(*entry)); @@ -561,11 +541,14 @@ int sbi_dbtr_install_trig(unsigned long smode, struct sbi_dbtr_trigger *trig; struct sbi_dbtr_hart_triggers_state *hs = NULL; - if (sbi_dbtr_shmem_disabled()) + hs = dbtr_thishart_state_ptr(); + if (!hs) + return SBI_ERR_FAILED; + + if (sbi_dbtr_shmem_disabled(hs)) return SBI_ERR_NO_SHMEM; - shmem_base = hart_shmem_base(); - hs = dbtr_thishart_state_ptr(); + shmem_base = hart_shmem_base(hs); /* Check requested triggers configuration */ for_each_trig_entry(shmem_base, trig_count, typeof(*entry), entry) { @@ -673,11 +656,14 @@ int sbi_dbtr_update_trig(unsigned long smode, void *shmem_base = NULL; struct sbi_dbtr_hart_triggers_state *hs = NULL; - if (sbi_dbtr_shmem_disabled()) + hs = dbtr_thishart_state_ptr(); + if (!hs) + return SBI_ERR_FAILED; + + if (sbi_dbtr_shmem_disabled(hs)) return SBI_ERR_NO_SHMEM; - shmem_base = hart_shmem_base(); - hs = dbtr_thishart_state_ptr(); + shmem_base = hart_shmem_base(hs); for_each_set_bit_from(idx, &trig_mask, hs->total_trigs) { trig = INDEX_TO_TRIGGER(idx);