From patchwork Thu Sep 1 22:27:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 12963409 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 C8418ECAAD3 for ; Thu, 1 Sep 2022 22:39:07 +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=rsI/UqwZ6ehpQsUSvQpocJb1/a3HR9LuIfAm29rb4/I=; b=hogLNwH2xlULfr Es9ut4em92OLxczYPFH/CO+w8jHPwdyFNKcWASkFw0fohOB+FfUUDzmvjE8anNou4KuvEhOQ8eUZZ 7BQhysRfloU6nBjPbExQ6YkQG98wk+vvtRyIiXtcggjgBXSHHl0CGgkeMQL0oWsZPmmJvMimVH76Z exR30D4aImtEtrCByz0dnLcAZBnBpe0OyT2b2sWa+q2iGZqczNaG/l/ktnwAnmwt2sWyfyImyUCQ/ YUIaPFeQyw2Fxin1scJY+PKIdINWcEMfI7pZRtsxnZKhULLJ07v5/EdVTxgV2/r5E0Vd4o+x4lUOj 8prRRSBYxDhCZEMAX+3g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTspr-00FRjX-1a; Thu, 01 Sep 2022 22:38:55 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oTsfh-00FLKA-Fz for linux-riscv@lists.infradead.org; Thu, 01 Sep 2022 22:28:26 +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 1oTsfW-0007wk-Sn; Fri, 02 Sep 2022 00:28:14 +0200 From: Heiko Stuebner To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu Cc: conor.dooley@microchip.com, guoren@kernel.org, apatel@ventanamicro.com, atishp@rivosinc.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Heiko Stuebner Subject: [PATCH 4/4] riscv: check for kernel config option in t-head memory types errata Date: Fri, 2 Sep 2022 00:27:44 +0200 Message-Id: <20220901222744.2210215-4-heiko@sntech.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220901222744.2210215-1-heiko@sntech.de> References: <20220901222744.2210215-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220901_152825_569802_4DEFB1CE X-CRM114-Status: GOOD ( 10.95 ) 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. Signed-off-by: Heiko Stuebner Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- 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;