From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BEFFC32750 for ; Fri, 2 Aug 2019 07:04:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19C46206A3 for ; Fri, 2 Aug 2019 07:04:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732058AbfHBHD7 (ORCPT ); Fri, 2 Aug 2019 03:03:59 -0400 Received: from verein.lst.de ([213.95.11.211]:50245 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389182AbfHBHD7 (ORCPT ); Fri, 2 Aug 2019 03:03:59 -0400 Received: by verein.lst.de (Postfix, from userid 2407) id 9BBBA68B05; Fri, 2 Aug 2019 09:03:54 +0200 (CEST) Date: Fri, 2 Aug 2019 09:03:54 +0200 From: Christoph Hellwig To: Takashi Iwai , iommu@lists.linux-foundation.org, Marek Szyprowski Cc: linux-xtensa@linux-xtensa.org, Michal Simek , linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, Robin Murphy , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 5/5] dma-mapping: remove ARCH_NO_COHERENT_DMA_MMAP Message-ID: <20190802070354.GA8280@lst.de> References: <20190725063401.29904-1-hch@lst.de> <20190725063401.29904-6-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190725063401.29904-6-hch@lst.de> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org Takashi, any comments on the sounds/ side of this? On Thu, Jul 25, 2019 at 08:34:01AM +0200, Christoph Hellwig wrote: > Now that we never use a default ->mmap implementation, and non-coherent > architectures can control the presence of ->mmap support by enabling > ARCH_HAS_DMA_COHERENT_TO_PFN for the dma direct implementation there > is no need for a global config option to control the availability > of dma_common_mmap. > > Signed-off-by: Christoph Hellwig > --- > arch/Kconfig | 3 --- > arch/c6x/Kconfig | 1 - > arch/m68k/Kconfig | 1 - > arch/microblaze/Kconfig | 1 - > arch/parisc/Kconfig | 1 - > arch/sh/Kconfig | 1 - > arch/xtensa/Kconfig | 1 - > kernel/dma/mapping.c | 4 ---- > sound/core/pcm_native.c | 10 +--------- > 9 files changed, 1 insertion(+), 22 deletions(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index a7b57dd42c26..ec2834206d08 100644 > --- a/arch/Kconfig > +++ b/arch/Kconfig > @@ -790,9 +790,6 @@ config COMPAT_32BIT_TIME > This is relevant on all 32-bit architectures, and 64-bit architectures > as part of compat syscall handling. > > -config ARCH_NO_COHERENT_DMA_MMAP > - bool > - > config ARCH_NO_PREEMPT > bool > > diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig > index b4fb61c83494..e65e8d82442a 100644 > --- a/arch/c6x/Kconfig > +++ b/arch/c6x/Kconfig > @@ -20,7 +20,6 @@ config C6X > select OF_EARLY_FLATTREE > select GENERIC_CLOCKEVENTS > select MODULES_USE_ELF_RELA > - select ARCH_NO_COHERENT_DMA_MMAP > select MMU_GATHER_NO_RANGE if MMU > > config MMU > diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig > index c518d695c376..614b355ae338 100644 > --- a/arch/m68k/Kconfig > +++ b/arch/m68k/Kconfig > @@ -8,7 +8,6 @@ config M68K > select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE > select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA > select ARCH_MIGHT_HAVE_PC_PARPORT if ISA > - select ARCH_NO_COHERENT_DMA_MMAP if !MMU > select ARCH_NO_PREEMPT if !COLDFIRE > select BINFMT_FLAT_ARGVP_ENVP_ON_STACK > select DMA_DIRECT_REMAP if HAS_DMA && MMU && !COLDFIRE > diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig > index d411de05b628..632c9477a0f6 100644 > --- a/arch/microblaze/Kconfig > +++ b/arch/microblaze/Kconfig > @@ -9,7 +9,6 @@ config MICROBLAZE > select ARCH_HAS_SYNC_DMA_FOR_CPU > select ARCH_HAS_SYNC_DMA_FOR_DEVICE > select ARCH_MIGHT_HAVE_PC_PARPORT > - select ARCH_NO_COHERENT_DMA_MMAP if !MMU > select ARCH_WANT_IPC_PARSE_VERSION > select BUILDTIME_EXTABLE_SORT > select TIMER_OF > diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig > index 6d732e451071..e9dd88b7f81e 100644 > --- a/arch/parisc/Kconfig > +++ b/arch/parisc/Kconfig > @@ -52,7 +52,6 @@ config PARISC > select GENERIC_SCHED_CLOCK > select HAVE_UNSTABLE_SCHED_CLOCK if SMP > select GENERIC_CLOCKEVENTS > - select ARCH_NO_COHERENT_DMA_MMAP > select CPU_NO_EFFICIENT_FFS > select NEED_DMA_MAP_STATE > select NEED_SG_DMA_LENGTH > diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig > index 6b1b5941b618..f356ee674d89 100644 > --- a/arch/sh/Kconfig > +++ b/arch/sh/Kconfig > @@ -5,7 +5,6 @@ config SUPERH > select ARCH_HAS_PTE_SPECIAL > select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST > select ARCH_MIGHT_HAVE_PC_PARPORT > - select ARCH_NO_COHERENT_DMA_MMAP if !MMU > select HAVE_PATA_PLATFORM > select CLKDEV_LOOKUP > select DMA_DECLARE_COHERENT > diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig > index ebc135bda921..70653aed3005 100644 > --- a/arch/xtensa/Kconfig > +++ b/arch/xtensa/Kconfig > @@ -5,7 +5,6 @@ config XTENSA > select ARCH_HAS_BINFMT_FLAT if !MMU > select ARCH_HAS_SYNC_DMA_FOR_CPU > select ARCH_HAS_SYNC_DMA_FOR_DEVICE > - select ARCH_NO_COHERENT_DMA_MMAP if !MMU > select ARCH_USE_QUEUED_RWLOCKS > select ARCH_USE_QUEUED_SPINLOCKS > select ARCH_WANT_FRAME_POINTERS > diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c > index 7dff1829c8c5..815446f76995 100644 > --- a/kernel/dma/mapping.c > +++ b/kernel/dma/mapping.c > @@ -169,7 +169,6 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, > void *cpu_addr, dma_addr_t dma_addr, size_t size, > unsigned long attrs) > { > -#ifndef CONFIG_ARCH_NO_COHERENT_DMA_MMAP > unsigned long user_count = vma_pages(vma); > unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; > unsigned long off = vma->vm_pgoff; > @@ -198,9 +197,6 @@ int dma_common_mmap(struct device *dev, struct vm_area_struct *vma, > > return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff, > user_count << PAGE_SHIFT, vma->vm_page_prot); > -#else > - return -ENXIO; > -#endif /* !CONFIG_ARCH_NO_COHERENT_DMA_MMAP */ > } > > /** > diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c > index 860543a4c840..2dadc708343a 100644 > --- a/sound/core/pcm_native.c > +++ b/sound/core/pcm_native.c > @@ -218,15 +218,7 @@ int snd_pcm_info_user(struct snd_pcm_substream *substream, > > static bool hw_support_mmap(struct snd_pcm_substream *substream) > { > - if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP)) > - return false; > - /* architecture supports dma_mmap_coherent()? */ > -#if defined(CONFIG_ARCH_NO_COHERENT_DMA_MMAP) || !defined(CONFIG_HAS_DMA) > - if (!substream->ops->mmap && > - substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) > - return false; > -#endif > - return true; > + return substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP; > } > > static int constrain_mask_params(struct snd_pcm_substream *substream, > -- > 2.20.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ---end quoted text---