From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 13 Mar 2025 08:55:08 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tsdPI-00DTpA-1p for lore@lore.pengutronix.de; Thu, 13 Mar 2025 08:55:07 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tsdPH-00027M-DH for lore@pengutronix.de; Thu, 13 Mar 2025 08:55:07 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=s4eIcxopZtTV3Xup1OrlQSiSBX0mH5q4wyKy0sge2Gc=; b=SDPe8bLzTfaWOrg1qMErwP3gHu OT++ancVh4oNRmzobObHFLK2mSmaH4KxiWvD+fj/hoGvJfMiVg7uc4b+zPp5984bm8LRzOrdLs7AO CtKC1fpx+VCuDGZXvdAaWv7aw2hPgh0Kojs0wrhgM4L4t4c+3sn032pw2wQ2BXK4WC6pM+lQn/ZUO ry2ou/OGFCuMwkbuInfWLNaUJ3KVN+CER4Gx1EmZXte+LX0zZXQdbpghpGQHUaYCrdxc8HwSKkvKL U7HzuBjdXvsAAx4b05JJnWj0pO892gxTqTB4hdHKKBWUpazNG2Q82gWdsMD/G3vDizC6r6MhSVRuQ 5kN0/UIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsdOu-0000000ATHr-1ApF; Thu, 13 Mar 2025 07:54:44 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tsdOY-0000000ATA7-10BX for barebox@lists.infradead.org; Thu, 13 Mar 2025 07:54:25 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tsdOW-0001jT-RM; Thu, 13 Mar 2025 08:54:20 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tsdOW-005Uyn-24; Thu, 13 Mar 2025 08:54:20 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tsdOW-00DRHH-1k; Thu, 13 Mar 2025 08:54:20 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 13 Mar 2025 08:54:12 +0100 Message-Id: <20250313075416.3202194-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313075416.3202194-1-a.fatoum@pengutronix.de> References: <20250313075416.3202194-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250313_005422_314619_381B87DE X-CRM114-Status: GOOD ( 11.37 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 2/6] RISC-V: rename HAS_CACHE to RISCV_ICACHE X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) CONFIG_HAS_CACHE only serves a purpose on RISC-V to allow barebox to run on softcores without fence.i instruction. Rename the symbol to reflect that in preparation for removing HAS_CACHE altogether. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - no change --- arch/riscv/Kconfig.socs | 9 ++++++--- arch/riscv/include/asm/cache.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index ccda688faf6d..4a3b56b5fff4 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -19,7 +19,7 @@ config SOC_VIRT bool "QEMU Virt Machine" select RISCV_S_MODE select BOARD_GENERIC_DT - select HAS_CACHE + select RISCV_ICACHE select HAS_DEBUG_LL help Generates an image tht can be be booted by QEMU. The image is called @@ -46,7 +46,7 @@ config BOARD_RISCVEMU config CPU_SIFIVE bool - select HAS_CACHE + select RISCV_ICACHE config SOC_SIFIVE bool "SiFive SoCs" @@ -116,7 +116,7 @@ config SOC_ALLWINNER_SUN20I bool "Allwinner Sun20i SoCs" depends on ARCH_RV64I select HAS_DEBUG_LL - select HAS_CACHE + select RISCV_ICACHE if SOC_ALLWINNER_SUN20I @@ -130,6 +130,9 @@ endif comment "CPU features" +config RISCV_ICACHE + bool + config SIFIVE_L2 bool "SiFive L2 cache controller" depends on CPU_SIFIVE diff --git a/arch/riscv/include/asm/cache.h b/arch/riscv/include/asm/cache.h index c787f890017e..8c3cde669c30 100644 --- a/arch/riscv/include/asm/cache.h +++ b/arch/riscv/include/asm/cache.h @@ -21,7 +21,7 @@ static inline void thead_local_flush_icache_all(void) static inline void local_flush_icache_all(void) { -#ifdef CONFIG_HAS_CACHE +#ifdef CONFIG_RISCV_ICACHE switch(riscv_vendor_id()) { case THEAD_VENDOR_ID: thead_local_flush_icache_all(); -- 2.39.5