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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 0D111C32750 for ; Fri, 2 Aug 2019 08:24:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D865A20644 for ; Fri, 2 Aug 2019 08:24:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l5QD9Wxx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D865A20644 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bo4o9hafcolJZ95PAW+AJ/MOHb7dnY5JxfWyqXUmjbc=; b=l5QD9WxxVGFmla zEECwPisXJGiVmhmDfgIFpdUYsUXa8wYDDIad1HHfjW47yOAPUsYdm5uc7WQ37c4fw+omeRoB69wA cVDJj6W5cXkDKDEQ5xtNbupo44HLr9mHdhr1s2gn9Fx8TtCPzNYWmeRojoZEA4qAhQJoL3zb8rhUh G+i6I13x0hGBIH9Vm1zrIQgL+VDysMGTfMROa8yrpyRuuOVgmjJ4HTkqO696+JrqModQGljSj5C5k YmtbIY2WFL9WS5L509fuy89trVmg+AhSIG6bZxXaocG5By8pbNUfqDuLtg3CizBR8/YxbfICEG0rv qLDTB7/Te75RC3NhmXNw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1htSr8-0000hf-8g; Fri, 02 Aug 2019 08:24:06 +0000 Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1htSr4-0000gw-LO for linux-arm-kernel@lists.infradead.org; Fri, 02 Aug 2019 08:24:04 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5BDC3AE6D; Fri, 2 Aug 2019 08:23:59 +0000 (UTC) Date: Fri, 02 Aug 2019 10:24:02 +0200 Message-ID: From: Takashi Iwai To: Christoph Hellwig Subject: Re: [PATCH 5/5] dma-mapping: remove ARCH_NO_COHERENT_DMA_MMAP In-Reply-To: <20190802070354.GA8280@lst.de> References: <20190725063401.29904-1-hch@lst.de> <20190725063401.29904-6-hch@lst.de> <20190802070354.GA8280@lst.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190802_012402_996787_D8D6732E X-CRM114-Status: GOOD ( 23.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-xtensa@linux-xtensa.org, Michal Simek , linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, Takashi Iwai , Robin Murphy , x86@kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-m68k@lists.linux-m68k.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 02 Aug 2019 09:03:54 +0200, Christoph Hellwig wrote: > > Takashi, > > any comments on the sounds/ side of this? I wasn't careful enough to look at that change, sorry. The code there tries to check whether dma_mmap_coherent() would always fail on some platforms. Then the driver clears the mmap capability flag at the device open time and notifies user-space to fall back to the dumb read/write mode. So I'm afraid that simply dropping the check would cause the behavior regression, e.g. on PARISC. Is there any simple way to test whether dma_mmap_coherent() would work or not in general on the target platform? It's not necessarily in an ifdef at all. thanks, Takashi > 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--- > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel