From patchwork Mon Sep 5 11:10:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12966175 X-Patchwork-Delegate: palmer@dabbelt.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B360BECAAD5 for ; Mon, 5 Sep 2022 14:14:24 +0000 (UTC) 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=P8MjzpF9FzH/BJHV3szsTKHOKMmbzr03ihlSzA3jdiw=; b=ntWcCB1SWSyr8H 816ogxXOixLUF7BjDtbpgSq5EhwLMgxeBj+xp/UMdK3GbvM2tMsXj09VWSFkqhtXiAbvlyqj4m+Ji K/iUEvTnY1zB35kDVIiSJuuzffb4bx6ihX4NYZzp2H+br/XDxUFFIisUgH1KthDZs0qVWZYdZv84L BepQObosU56/Sffh86fchSQqpo3kVwM4NQDnOxrrylDD1VhRTldBMvLBYns8/H8aGY7SiCipOw7Ob 62YTnfl3mUg9lvN0Akl9d257Yt/z7JGHs/gB3kBSCVBHDF/fH54rfYQTbgXiwEfLnDL9ySZlbSXY1 hA1oMnqq0kLnotGDIKVg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVCrV-004FHo-JU; Mon, 05 Sep 2022 14:14:05 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA09-000vN7-4L for linux-riscv@bombadil.infradead.org; Mon, 05 Sep 2022 11:10:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=Hp3Baa9Vp2/Pzt8nqZvYRN7h70NaY8AiwJ4z8CV0iww=; b=Srkjap7EVD1QYftRji3Xf4X+mL n2uCJ1N90GvVM7/8W9m0aoWhEErOX/BCc+iBaSjHna0bFLu6bXJv8LmdReyl3tSAio2tV11tVYVl7 TjBP8qL898CQEIGOa1qsc1URNua4Dgb4fe9e3w2bk4enAAXRZlDp403FyMLZzsGroaU7fEZsraC/w o3t+ImmiHPMd3n3cofskVHXD159Pmsv28Qy6ycwBHhbY+Kc5InAIYTYg7BGppTxichjkOc0yrxzJL E517ChAXeuz5UERO+v3JZOsWwqh5C84ypNqT4XlsOR9nsQY58z3n43pXSmTZkEj0Jp0ZJMSgK0I8p epsq5FDQ==; Received: from gloria.sntech.de ([185.11.138.130]) by casper.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA07-009QFP-46 for linux-riscv@lists.infradead.org; Mon, 05 Sep 2022 11:10:49 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oV9zw-0005hc-TA; Mon, 05 Sep 2022 13:10:36 +0200 From: Heiko Stuebner To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: guoren@kernel.org, apatel@ventanamicro.com, atishp@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Conor Dooley , Andrew Jones Subject: [PATCH v2 1/5] riscv: cleanup svpbmt cpufeature probing Date: Mon, 5 Sep 2022 13:10:23 +0200 Message-Id: <20220905111027.2463297-2-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220905111027.2463297-1-heiko@sntech.de> References: <20220905111027.2463297-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220905_121047_244644_AA5EB275 X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org For better readability (and compile time coverage) use IS_ENABLED instead of ifdef and drop the new unneeded switch statement. Signed-off-by: Heiko Stuebner Reviewed-by: Guo Ren Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- arch/riscv/kernel/cpufeature.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 553d755483ed..764ea220161f 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -253,16 +253,13 @@ void __init riscv_fill_hwcap(void) #ifdef CONFIG_RISCV_ALTERNATIVE static bool __init_or_module cpufeature_probe_svpbmt(unsigned int stage) { -#ifdef CONFIG_RISCV_ISA_SVPBMT - switch (stage) { - case RISCV_ALTERNATIVES_EARLY_BOOT: + if (!IS_ENABLED(CONFIG_RISCV_ISA_SVPBMT)) return false; - default: - return riscv_isa_extension_available(NULL, SVPBMT); - } -#endif - return false; + if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) + return false; + + return riscv_isa_extension_available(NULL, SVPBMT); } static bool __init_or_module cpufeature_probe_zicbom(unsigned int stage) From patchwork Mon Sep 5 11:10:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12966173 X-Patchwork-Delegate: palmer@dabbelt.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CBC76ECAAD3 for ; Mon, 5 Sep 2022 14:13:56 +0000 (UTC) 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=bv+fsp9ESMdLclp5Qhoi0Mmfb954xzqPQilv6Pi5jEs=; b=pF1v6pJ6QRaXnI hhoHjgWxrlvpuRpJJrSp6EtwdkjAuAQIq9EzTXgfm5w8MwovdecsQ+SPnYXlXP+BPJlJSekLkP4SA i1Y1wZCKrxAQLwxUJPV0uKOdJidEOtd3utpjfc8KIy97AJcZP0WZvWdffTL58Wo/TUzhxcjxvq1r9 oL72L0lfuzLZ/nbYRg/hAKfnZ2aO7dV0D1m+wE7rfd9+aDIomdWGLW3lCQNomaI+MIbhGnyEx6kGH K9naH5tdfeNXd7mRLnTsUIZoEA8UWbv53L1xwA82WpgqaQghNzJr/kCe2/IZwsFcGvJQ3AEScnzSR VpsmX0HmcN0L6FBaY1SQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVCr7-004F0h-1q; Mon, 05 Sep 2022 14:13:41 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA07-000vM7-HX for linux-riscv@bombadil.infradead.org; Mon, 05 Sep 2022 11:10:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=i1ZBOXST+yjqLPtYsxjXteCS3Mradym44BMUoexQqDk=; b=qajhTgOuxkudEx+4Rmg0Oz45P5 hgCLcbU0QW/yQNVYXTiw8Q4anm97NrAqR4X0rD9ncHjI9tVTHBcOOaPiblnABeRsBMM++h5sczdcj bvsEpy6H7qdkoKnJdCuL3XeVWZlBVfnTUAcKD/hxPoINxkOhn1DjPsrhDuku0xvGFT3oTlKegVm+k QA2FxRFnJcDPhNBXAb+XavobBJxARn4dE38S1qrUnqDq7Ahs3pzJOtVuwLwJA/086FGraarrI93d/ 1lIxdOSTqqIjbP6uhgnAgdDFiJ55v7+UzzmCAPavmnQO17isGr1MEpkkAVeuDeFKokPa3cMDWcj3o mKJ9JSXg==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA03-009Yu7-V2 for linux-riscv@lists.infradead.org; Mon, 05 Sep 2022 11:10:45 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oV9zx-0005hc-9Q; Mon, 05 Sep 2022 13:10:37 +0200 From: Heiko Stuebner To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: guoren@kernel.org, apatel@ventanamicro.com, atishp@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Conor Dooley , Andrew Jones Subject: [PATCH v2 2/5] riscv: drop some idefs from CMO initialization Date: Mon, 5 Sep 2022 13:10:24 +0200 Message-Id: <20220905111027.2463297-3-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220905111027.2463297-1-heiko@sntech.de> References: <20220905111027.2463297-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220905_121044_164462_28C2CF74 X-CRM114-Status: GOOD ( 11.82 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Wrapping things in #ifdefs makes the code harder to read while we also have IS_ENABLED() macros to do this in regular code and the extension detection is not _that_ runtime critical. So define a stub for riscv_noncoherent_supported() in the non-CONFIG_RISCV_DMA_NONCOHERENT case and move the code to us IS_ENABLED. Suggested-by: Conor Dooley Signed-off-by: Heiko Stuebner Reviewed-by: Guo Ren Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- arch/riscv/errata/thead/errata.c | 7 +++---- arch/riscv/include/asm/cacheflush.h | 2 ++ arch/riscv/kernel/cpufeature.c | 22 +++++++++------------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c index 202c83f677b2..bffa711aaf64 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -30,7 +30,9 @@ static bool errata_probe_pbmt(unsigned int stage, static bool errata_probe_cmo(unsigned int stage, unsigned long arch_id, unsigned long impid) { -#ifdef CONFIG_ERRATA_THEAD_CMO + if (!IS_ENABLED(CONFIG_ERRATA_THEAD_CMO)) + return false; + if (arch_id != 0 || impid != 0) return false; @@ -39,9 +41,6 @@ static bool errata_probe_cmo(unsigned int stage, riscv_noncoherent_supported(); return true; -#else - return false; -#endif } static u32 thead_errata_probe(unsigned int stage, diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h index a60acaecfeda..4363d0beb38a 100644 --- a/arch/riscv/include/asm/cacheflush.h +++ b/arch/riscv/include/asm/cacheflush.h @@ -50,6 +50,8 @@ static inline void riscv_init_cbom_blocksize(void) { } #ifdef CONFIG_RISCV_DMA_NONCOHERENT void riscv_noncoherent_supported(void); +#else +static inline void riscv_noncoherent_supported(void) {} #endif /* diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 764ea220161f..729f7a218093 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -264,21 +264,17 @@ static bool __init_or_module cpufeature_probe_svpbmt(unsigned int stage) static bool __init_or_module cpufeature_probe_zicbom(unsigned int stage) { -#ifdef CONFIG_RISCV_ISA_ZICBOM - switch (stage) { - case RISCV_ALTERNATIVES_EARLY_BOOT: + if (!IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM)) + return false; + + if (stage == RISCV_ALTERNATIVES_EARLY_BOOT) + return false; + + if (!riscv_isa_extension_available(NULL, ZICBOM)) return false; - default: - if (riscv_isa_extension_available(NULL, ZICBOM)) { - riscv_noncoherent_supported(); - return true; - } else { - return false; - } - } -#endif - return false; + riscv_noncoherent_supported(); + return true; } /* From patchwork Mon Sep 5 11:10:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12966177 X-Patchwork-Delegate: palmer@dabbelt.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84DDAECAAD5 for ; Mon, 5 Sep 2022 14:14:45 +0000 (UTC) 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=aL8fAnWa6z0meA1ZFb9G3gWpEdwwX8rkmEFgXkDML3M=; b=y6KTgqGfTgb8Lx tZyi0+9j0bLIqHr0Gejf4vAVos+VyLFxONAgtnfmuNZrAW6MB0G3GK/M+Q43MGac/8k7I+Aa3gd+9 6aiYaRYXVvrd4BK04y6R4Qd2rhnPwvkYrtkcJHfXYKvRk2JH639jsGhEMP1Gj73r/1qjlRgGJIpbo Arzy+hEQNVt6U6hUbjg2NHoJjiROrNy+55dBaZrJgvvBG19k8Zgi5SXBwfYGeFSuHEVLa2LmC1eFi DiktZpr+zqZDvaY46r8q9eJc6ctYqe+cldFMaLVSjlUMO73mHFitUYeCqlJD7RHsl0C0pSRlGqKiI FdHVDbpDRQizmvpvQRAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVCrw-004Fbv-RV; Mon, 05 Sep 2022 14:14:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA0A-000vM7-AY for linux-riscv@bombadil.infradead.org; Mon, 05 Sep 2022 11:10:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=iTakt3lV7rDBfj6zMK7PDrQi9jdie4tNamf8xHspI2w=; b=eb81z6vSZUm6AJxgIylU5Q9DAv EMF3jR1GfxuDabswM7y4/OTq5xth1uWcFI5hEuarIP6xUJ2Qx12qmk5wq/Gvv7kl7DgGlOdsbtbOx hLOXXuATjk8bP1ATJlD1LQGlVe6H7qCy17QAeaJaAXy9W8/sYdWyf1xNwUL6ADBGc0wJSzix9HF8P MoG8RYoBFu4i2JbMcgvFkqfJI6N+6Mc6v/bQmDUn8lFp3NlwZ1TQUENpAEyU6ksbUS77R16O3sH4y vqFr8KVFx1XkHta+m1r44WOGmSPiTnONia493+4jl/n4F8Su+OgBiSyl+kjNO3ChfXiJPh/BK8zeF BBOtnzKA==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA04-009YuB-7a for linux-riscv@lists.infradead.org; Mon, 05 Sep 2022 11:10:46 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oV9zx-0005hc-Lt; Mon, 05 Sep 2022 13:10:37 +0200 From: Heiko Stuebner To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: guoren@kernel.org, apatel@ventanamicro.com, atishp@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Conor Dooley , Andrew Jones Subject: [PATCH v2 3/5] riscv: use BIT() macros in t-head errata init Date: Mon, 5 Sep 2022 13:10:25 +0200 Message-Id: <20220905111027.2463297-4-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220905111027.2463297-1-heiko@sntech.de> References: <20220905111027.2463297-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220905_121044_410998_93E57D83 X-CRM114-Status: GOOD ( 10.40 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Using the appropriate BIT macro makes the code better readable. Suggested-by: Conor Dooley Signed-off-by: Heiko Stuebner Reviewed-by: Guo Ren Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- arch/riscv/errata/thead/errata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c index bffa711aaf64..a6f4bd8ccf3f 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -49,10 +49,10 @@ static u32 thead_errata_probe(unsigned int stage, u32 cpu_req_errata = 0; if (errata_probe_pbmt(stage, archid, impid)) - cpu_req_errata |= (1U << ERRATA_THEAD_PBMT); + cpu_req_errata |= BIT(ERRATA_THEAD_PBMT); if (errata_probe_cmo(stage, archid, impid)) - cpu_req_errata |= (1U << ERRATA_THEAD_CMO); + cpu_req_errata |= BIT(ERRATA_THEAD_CMO); return cpu_req_errata; } From patchwork Mon Sep 5 11:10:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12966178 X-Patchwork-Delegate: palmer@dabbelt.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D93CECAAD5 for ; Mon, 5 Sep 2022 14:14:55 +0000 (UTC) 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=tZuD2e3QKbWfO2eL9A1FA0YUgw6f25FVRFrnOKxsjj8=; b=dCElKtJfPfDSeB zI7OsB9l2Y3fPUyflkY8psw6KVQsuYEU4ZHnHztBlajndajI7ogrsAYKeX+5f2K3VVNsnz4/aL1OC VBcnDuqyr4RFBcAHtxSaRHkG7E7MSzkancfGTTtmET4RCTfmosxIviYKHnqi5fgypItKzbUaNhPL+ SO/FowhRyH2RbxlEn38XKutb5ysIT+WRg8z53XvlNMPsAyow3xzDtl63nwP4q+4uryMSCIW8QEeDv SffhsQEbMegF9Wq7KkDpZlHVsWwUA+ky0dmhNhO84/ZXygdd0KzPvQcLg7LlHtT0QSZBnTaqqpSJH twBZn5SC+8o89PyR1aUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVCs4-004FiH-1c; Mon, 05 Sep 2022 14:14:40 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA0A-000vLc-Tq for linux-riscv@bombadil.infradead.org; Mon, 05 Sep 2022 11:10:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=GtckfgR+zRLgkF9jUpLwgWNTOTQm6QSXVcTTAkb7Ptg=; b=gPxBj4ufLf/s5/6+4ZurZDwnrF SUtG6IHpdoeb0HubDpz9l9gelYFiD9Fo1ZSD0nBLM2f1ZE4xeK/w1lVeemmqbdxsAMhJ8KRgrA1u3 F3JqydOsgBoAMODjR+aZjOEXUQR8Z9mZzhvYbomUvz4Cqa+cBzhl31PSVu1GNDRt8YC9ExfGQ74lX 7W71AXakvw8W8U7hnt8lDpi6bqD9VVytoyaL6N5PKxm8h/FBkDEL9kItft6HueC6E9CoGp4GByXLh /WX8M1rA52LXyZ3a2r78q5gFJzXLLzs/rIF4aqx0shwvohfhciyCEQjjAtaIQRz5IREgBN/2jaRrm Zq4JT3GQ==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA04-009YuM-9S for linux-riscv@lists.infradead.org; Mon, 05 Sep 2022 11:10:46 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oV9zy-0005hc-23; Mon, 05 Sep 2022 13:10:38 +0200 From: Heiko Stuebner To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: guoren@kernel.org, apatel@ventanamicro.com, atishp@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Conor Dooley Subject: [PATCH v2 4/5] riscv: use BIT() marco for cpufeature probing Date: Mon, 5 Sep 2022 13:10:26 +0200 Message-Id: <20220905111027.2463297-5-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220905111027.2463297-1-heiko@sntech.de> References: <20220905111027.2463297-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220905_121044_442631_CF37DE40 X-CRM114-Status: GOOD ( 10.41 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Using the appropriate BIT macro makes the code better readable. Suggested-by: Conor Dooley Signed-off-by: Heiko Stuebner Reviewed-by: Conor Dooley Reviewed-by: Guo Ren --- arch/riscv/kernel/cpufeature.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 729f7a218093..08f7445985dc 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -289,10 +289,10 @@ static u32 __init_or_module cpufeature_probe(unsigned int stage) u32 cpu_req_feature = 0; if (cpufeature_probe_svpbmt(stage)) - cpu_req_feature |= (1U << CPUFEATURE_SVPBMT); + cpu_req_feature |= BIT(CPUFEATURE_SVPBMT); if (cpufeature_probe_zicbom(stage)) - cpu_req_feature |= (1U << CPUFEATURE_ZICBOM); + cpu_req_feature |= BIT(CPUFEATURE_ZICBOM); return cpu_req_feature; } From patchwork Mon Sep 5 11:10:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 12966174 X-Patchwork-Delegate: palmer@dabbelt.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91D94ECAAD5 for ; Mon, 5 Sep 2022 14:14:17 +0000 (UTC) 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=jQGj70uljsqhhy5FIYVXPklhZQFduszcHE0o/8b/wtU=; b=ql0sZ+FUGAYqwk B+7Ml0rTSr4t7hsdvE04LuE0n0+hr+AoRyN45aITmS1Cy5vwrF3XwkHopH2RYOxketISR987uviOQ MZHXdgGPKB10SAYLwPEAXiFvkDMCHlZlFAgsJ94cvfJDwrP56uRm0JS5ndpbQjXBujSHHEyyzNCIR Uu8R6W5KR8+a4pdjmaDGicTmVXYYxe9xz88Fhm4F9KVVJrtOQyuvwUkkETvRxaO5aBuqCGqyd9aHF gaEQ4auop4JYCQaRRJ5v9dklOZIEuXDjctc/fvMyrDzNFJaAYjOn424oWKK8lXextHPk6RlPJYzda tpeut89plmXa9m1nh+MQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVCrM-004FBa-Ct; Mon, 05 Sep 2022 14:13:57 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA0A-000vLc-85 for linux-riscv@bombadil.infradead.org; Mon, 05 Sep 2022 11:10:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=L9KKgEPy3SjGw20UQbOAO1tOG2Dn+WodzDbVIztHbzE=; b=mbKDrAms7cOknBWdSm9lEf7dWk asr8ryzJUFu5VB5Yn4D215XXPUAre1yaZ9BWvI3jLdJU4BFC/USh1QR0dwKi3ryTZJKASWY+MEvgq 6Ue0i7Obb03VJRTj6gN/Y5/S7mLYJSLJIK6Bcbjr/TIf6NnARMG3bMz0OavzyP0zp4h8q/CvRv+BK mJDFjTDa1Z+ag2B9CKxo/4AVaGwslXKNZbAQPTg6SlCG+c/fnXHOl3mLpv0tMyerPAJZsuAuIggWw UgtKZwFUtSGA2iA0EafiA41fMetjs1qKxJbRRdw1mpiFz0YbDH1JFw4KI6b7/L7NgvVwtmh/q+F8C am4OrEbw==; Received: from gloria.sntech.de ([185.11.138.130]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVA04-009YuN-0b for linux-riscv@lists.infradead.org; Mon, 05 Sep 2022 11:10:46 +0000 Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=phil.lan) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oV9zy-0005hc-Ea; Mon, 05 Sep 2022 13:10:38 +0200 From: Heiko Stuebner To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: guoren@kernel.org, apatel@ventanamicro.com, atishp@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner , Conor Dooley , Andrew Jones Subject: [PATCH v2 5/5] riscv: check for kernel config option in t-head memory types errata Date: Mon, 5 Sep 2022 13:10:27 +0200 Message-Id: <20220905111027.2463297-6-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220905111027.2463297-1-heiko@sntech.de> References: <20220905111027.2463297-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220905_121044_265058_DACF2562 X-CRM114-Status: GOOD ( 10.58 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The t-head variant of page-based memory types should also check first for the enabled kernel config option. Fixes: a35707c3d850 ("riscv: add memory-type errata for T-Head") Signed-off-by: Heiko Stuebner Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones Reviewed-by: Guo Ren --- arch/riscv/errata/thead/errata.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/riscv/errata/thead/errata.c b/arch/riscv/errata/thead/errata.c index a6f4bd8ccf3f..902e12452821 100644 --- a/arch/riscv/errata/thead/errata.c +++ b/arch/riscv/errata/thead/errata.c @@ -17,6 +17,9 @@ static bool errata_probe_pbmt(unsigned int stage, unsigned long arch_id, unsigned long impid) { + if (!IS_ENABLED(CONFIG_ERRATA_THEAD_PBMT)) + return false; + if (arch_id != 0 || impid != 0) return false;