From patchwork Wed Oct 18 05:26:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13426351 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0A016CDB482 for ; Wed, 18 Oct 2023 05:27:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id BD54CC433C8; Wed, 18 Oct 2023 05:27:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 2969BC433C9; Wed, 18 Oct 2023 05:27:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 2969BC433C9 Authentication-Results: smtp.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=x5ptCfsg9O1HYYf76yB/HYRE+aWyZspmFlULsvzlzxs=; b=EEX7yVzL2jqdUpXDrzbCf/ASzr 6uImQH4dWtc0YcIMuMTIGdhfLX6dIrl/y+IU1YA2Vq+TgzAKAT5W+N2lnhG7ZjTrXqe1b95oCe+I+ WTcvCauoAy/K41m3FQX5Im67b2Rr2p0BqXMDnUcDrZHFJ6Q6FUyiu/zrFoLXF1vhuQM4C0Eo3opJ7 IgiJIEj2SCAOkWujk/o+uihy7IOq2A4IrI2obzEJwLgAQe94ThSMkD0bo+xXrjC7ROVhP9T1BzJzv m7q2hntGnQrS51qiopoevjsYakimCsFKmWbBDZYGWhMzWvGdwkLRldFSLBAxTambg0gC5x04yrJYG KPTue/uw==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qsz59-00Dp3K-2I; Wed, 18 Oct 2023 05:27:00 +0000 From: Christoph Hellwig To: Paul Walmsley , Palmer Dabbelt , Conor Dooley , Geert Uytterhoeven , Magnus Damm List-Id: Cc: linux-riscv@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Arnd Bergmann , Olof Johansson , Samuel Holland , soc@kernel.org, Conor Dooley Subject: [PATCH 1/3] riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT Date: Wed, 18 Oct 2023 07:26:52 +0200 Message-Id: <20231018052654.50074-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018052654.50074-1-hch@lst.de> References: <20231018052654.50074-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html RISCV_NONSTANDARD_CACHE_OPS is also used for the pmem cache maintenance helpers, which are built into the kernel unconditionally. Signed-off-by: Christoph Hellwig Acked-by: Conor Dooley --- arch/riscv/Kconfig | 1 - drivers/cache/Kconfig | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index d607ab0f7c6daf..0ac0b538379718 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -277,7 +277,6 @@ config RISCV_DMA_NONCOHERENT config RISCV_NONSTANDARD_CACHE_OPS bool - depends on RISCV_DMA_NONCOHERENT help This enables function pointer support for non-standard noncoherent systems to handle cache management. diff --git a/drivers/cache/Kconfig b/drivers/cache/Kconfig index a57677f908f3ba..d6e5e3abaad8af 100644 --- a/drivers/cache/Kconfig +++ b/drivers/cache/Kconfig @@ -3,7 +3,7 @@ menu "Cache Drivers" config AX45MP_L2_CACHE bool "Andes Technology AX45MP L2 Cache controller" - depends on RISCV_DMA_NONCOHERENT + depends on RISCV select RISCV_NONSTANDARD_CACHE_OPS help Support for the L2 cache controller on Andes Technology AX45MP platforms. From patchwork Wed Oct 18 05:26:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13426352 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B79ADCDB47E for ; Wed, 18 Oct 2023 05:27:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 9CE49C433C7; Wed, 18 Oct 2023 05:27:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 78BC7C433C9; Wed, 18 Oct 2023 05:27:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 78BC7C433C9 Authentication-Results: smtp.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=Dg71jABRFFxFAs6VEuUBooR6bWlwptw1eIXzksL6fPM=; b=4HFJc7kXawQ6YmNcMm10THJLCx UT/2f5jpa10flaXdr2bBwKgBxkhcJa+cVP5vxUqnYmfQV9NjM9gipGPKzsX0qBEPr0f/nx1rvgmBL H1ZSRSQPBDOrM7ctfZla8ocGuPFxbh6WNdrw20+p1l2c3PFTIrM4xwZ5J76+tSadYxB28TPbW4wcy 1tF1nrEiuTLZlQyhGT11+wkQeC/swQjSkXqakm0u22cEW+0Oc4lBsOFbiRZDjhDokRw+Gj9MWe25X H7E1HNGb4OQzk4yBU2ixSC4+Cpjzyf8q5lgGjB4odyWn2m3KWD3MnWi94YSyx1aG9mdIGrGNqp1SI Yy/DqEBA==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qsz5C-00Dp3e-0O; Wed, 18 Oct 2023 05:27:02 +0000 From: Christoph Hellwig To: Paul Walmsley , Palmer Dabbelt , Conor Dooley , Geert Uytterhoeven , Magnus Damm List-Id: Cc: linux-riscv@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Arnd Bergmann , Olof Johansson , Samuel Holland , soc@kernel.org, Conor Dooley , Robin Murphy , Lad Prabhakar Subject: [PATCH 2/3] riscv: only select DMA_DIRECT_REMAP from RISCV_ISA_ZICBOM and ERRATA_THEAD_PBMT Date: Wed, 18 Oct 2023 07:26:53 +0200 Message-Id: <20231018052654.50074-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018052654.50074-1-hch@lst.de> References: <20231018052654.50074-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html RISCV_DMA_NONCOHERENT is also used for whacky non-standard non-coherent ops that use different hooks in dma-direct. Signed-off-by: Christoph Hellwig Reviewed-by: Conor Dooley Reviewed-by: Robin Murphy Reviewed-by: Lad Prabhakar Tested-by: Samuel Holland --- arch/riscv/Kconfig | 2 +- arch/riscv/Kconfig.errata | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 0ac0b538379718..9c48fecc671918 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -273,7 +273,6 @@ config RISCV_DMA_NONCOHERENT select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE select DMA_BOUNCE_UNALIGNED_KMALLOC if SWIOTLB - select DMA_DIRECT_REMAP if MMU config RISCV_NONSTANDARD_CACHE_OPS bool @@ -549,6 +548,7 @@ config RISCV_ISA_ZICBOM depends on RISCV_ALTERNATIVE default y select RISCV_DMA_NONCOHERENT + select DMA_DIRECT_REMAP help Adds support to dynamically detect the presence of the ZICBOM extension (Cache Block Management Operations) and enable its diff --git a/arch/riscv/Kconfig.errata b/arch/riscv/Kconfig.errata index 566bcefeab502c..e2c731cfed8cc6 100644 --- a/arch/riscv/Kconfig.errata +++ b/arch/riscv/Kconfig.errata @@ -77,6 +77,7 @@ config ERRATA_THEAD_PBMT config ERRATA_THEAD_CMO bool "Apply T-Head cache management errata" depends on ERRATA_THEAD && MMU + select DMA_DIRECT_REMAP select RISCV_DMA_NONCOHERENT default y help From patchwork Wed Oct 18 05:26:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13426353 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 72241CDB483 for ; Wed, 18 Oct 2023 05:27:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 5820BC433C8; Wed, 18 Oct 2023 05:27:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 5DA68C433C9; Wed, 18 Oct 2023 05:27:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 5DA68C433C9 Authentication-Results: smtp.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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=G1q5kjKCly+YP8ujUn6bFejuAy7IU52U7erNsqEL50A=; b=AJt060LlpGen+lRt6knsoShqCI O1W/l3v+OgIWq/dNaMJb68oogx+fY6vgqblyV4Y1KRKaOyksT1vqfK5muDYgdHc5Rt+HToKaa46RU t938WpSxFTPYLhNAaHW2h2vNOlNXM8BRefy0BJpwFtZ/6G+WXtWM2RhmY5fbLy622gLDJ7Ph9yQTE Gnax+zzBMMmlmtocynwK7oZGEL447qHcAs+mnIseEMeDcR9l7Zv2/Yni4fvt6AKzm6sLEP0PoSSAD 0pzr0tRkfqAeY38dz9SjP3tFzKzLdPYoWtprOPaiZnR2FCRoZXEHI/f923zQ3/ytp/9gXMXW+Y2A6 xt4V1l9g==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qsz5E-00Dp3w-1i; Wed, 18 Oct 2023 05:27:04 +0000 From: Christoph Hellwig To: Paul Walmsley , Palmer Dabbelt , Conor Dooley , Geert Uytterhoeven , Magnus Damm List-Id: Cc: linux-riscv@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Arnd Bergmann , Olof Johansson , Samuel Holland , soc@kernel.org, Lad Prabhakar , Conor Dooley Subject: [PATCH 3/3] soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM Date: Wed, 18 Oct 2023 07:26:54 +0200 Message-Id: <20231018052654.50074-4-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018052654.50074-1-hch@lst.de> References: <20231018052654.50074-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html ARCH_R9A07G043 has its own non-standard global pool based DMA coherent allocator, which conflicts with the remap based RISCV_ISA_ZICBOM version. Add a proper dependency. Signed-off-by: Christoph Hellwig Reviewed-by: Lad Prabhakar Acked-by: Conor Dooley Acked-by: Geert Uytterhoeven --- drivers/soc/renesas/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index 335251ff6e8214..624185e09c967b 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -341,6 +341,7 @@ config ARCH_R9A07G043 bool "RISC-V Platform support for RZ/Five" depends on NONPORTABLE depends on RISCV_ALTERNATIVE + depends on !RISCV_ISA_ZICBOM depends on RISCV_SBI select ARCH_RZG2L select AX45MP_L2_CACHE