From patchwork Tue Oct 17 13:59:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13425199 X-Patchwork-Delegate: geert@linux-m68k.org 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F451CDB474 for ; Tue, 17 Oct 2023 13:59:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343571AbjJQN7r (ORCPT ); Tue, 17 Oct 2023 09:59:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343975AbjJQN7q (ORCPT ); Tue, 17 Oct 2023 09:59:46 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DC00FD for ; Tue, 17 Oct 2023 06:59:45 -0700 (PDT) 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=OZYqVKF2BnfC7TrwYhJeul4vHW53Mw0roQsbMF/QnKo=; b=4a9tjl7JZvDPzI2TUKKicaYfR/ YW5AstZwxhfD3O6siujR9Dn6BWZVkDIBurWy6FAtwMih5aE2ou0E8U3vnkg7xpAPAcJ2HXeZo2WUe zikBEAjIh6KpEbuSNw9xPJ50pcOkKVRxrK4w3Ig+JETmWwj5tRLb4Govl1Mmltb2YwNQ1U1hFqHIK x9PcZRvrz+hcFSYvExrg3VW+D0jxYIJfV+2R54ey1ylqLTwVwjYXc+uZQaENKt1JpvZI/vYExdW86 /fmOK8wT3CEf8b5ElxEgNdxpgX6m/E8cuM5jImKYGgz96IAlBbogoPW/ilP/ek4b3qhFciuMrZszk 50G2p/OA==; Received: from 213-147-166-120.nat.highway.webapn.at ([213.147.166.120] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qskbk-00CTXE-18; Tue, 17 Oct 2023 13:59:41 +0000 From: Christoph Hellwig To: Paul Walmsley , Palmer Dabbelt , Conor Dooley , Geert Uytterhoeven , Magnus Damm Cc: linux-riscv@lists.infradead.org, linux-renesas-soc@vger.kernel.org, Arnd Bergmann , Olof Johansson , soc@kernel.org, Conor Dooley , Robin Murphy , Lad Prabhakar Subject: [PATCH 2/3] riscv: only select DMA_DIRECT_REMAP from RISCV_ISA_ZICBOM Date: Tue, 17 Oct 2023 15:59:25 +0200 Message-Id: <20231017135926.1240101-3-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017135926.1240101-1-hch@lst.de> References: <20231017135926.1240101-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 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org 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 --- arch/riscv/Kconfig | 2 +- 1 file changed, 1 insertion(+), 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