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=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED 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 31EBAC43334 for ; Thu, 6 Sep 2018 12:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D845C2075B for ; Thu, 6 Sep 2018 12:11:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D845C2075B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727862AbeIFQrB (ORCPT ); Thu, 6 Sep 2018 12:47:01 -0400 Received: from foss.arm.com ([217.140.101.70]:44402 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726436AbeIFQrB (ORCPT ); Thu, 6 Sep 2018 12:47:01 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A33FB1596; Thu, 6 Sep 2018 05:11:49 -0700 (PDT) Received: from [10.4.12.131] (e110467-lin.emea.arm.com [10.4.12.131]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8B5F43F575; Thu, 6 Sep 2018 05:11:48 -0700 (PDT) Subject: Re: [PATCH 1/4] arm-nommu: don't define arch_teardown_dma_ops To: Christoph Hellwig , iommu@lists.linux-foundation.org Cc: Marek Szyprowski , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20180827084711.23407-1-hch@lst.de> <20180827084711.23407-2-hch@lst.de> From: Robin Murphy Message-ID: Date: Thu, 6 Sep 2018 13:11:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180827084711.23407-2-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27/08/18 09:47, Christoph Hellwig wrote: > We can just use the default implementation. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > arch/arm/include/asm/dma-mapping.h | 2 ++ > arch/arm/mm/dma-mapping-nommu.c | 4 ---- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index 8436f6ade57d..965b7c846ecb 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -100,8 +100,10 @@ static inline unsigned long dma_max_pfn(struct device *dev) > extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > const struct iommu_ops *iommu, bool coherent); > > +#ifdef CONFIG_MMU > #define arch_teardown_dma_ops arch_teardown_dma_ops > extern void arch_teardown_dma_ops(struct device *dev); > +#endif > > /* do not use this function in a driver */ > static inline bool is_device_dma_coherent(struct device *dev) > diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c > index f448a0663b10..aa7aba302e76 100644 > --- a/arch/arm/mm/dma-mapping-nommu.c > +++ b/arch/arm/mm/dma-mapping-nommu.c > @@ -237,7 +237,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > > set_dma_ops(dev, dma_ops); > } > - > -void arch_teardown_dma_ops(struct device *dev) > -{ > -} > From mboxrd@z Thu Jan 1 00:00:00 1970 From: robin.murphy@arm.com (Robin Murphy) Date: Thu, 6 Sep 2018 13:11:46 +0100 Subject: [PATCH 1/4] arm-nommu: don't define arch_teardown_dma_ops In-Reply-To: <20180827084711.23407-2-hch@lst.de> References: <20180827084711.23407-1-hch@lst.de> <20180827084711.23407-2-hch@lst.de> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 27/08/18 09:47, Christoph Hellwig wrote: > We can just use the default implementation. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > arch/arm/include/asm/dma-mapping.h | 2 ++ > arch/arm/mm/dma-mapping-nommu.c | 4 ---- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index 8436f6ade57d..965b7c846ecb 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -100,8 +100,10 @@ static inline unsigned long dma_max_pfn(struct device *dev) > extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > const struct iommu_ops *iommu, bool coherent); > > +#ifdef CONFIG_MMU > #define arch_teardown_dma_ops arch_teardown_dma_ops > extern void arch_teardown_dma_ops(struct device *dev); > +#endif > > /* do not use this function in a driver */ > static inline bool is_device_dma_coherent(struct device *dev) > diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c > index f448a0663b10..aa7aba302e76 100644 > --- a/arch/arm/mm/dma-mapping-nommu.c > +++ b/arch/arm/mm/dma-mapping-nommu.c > @@ -237,7 +237,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > > set_dma_ops(dev, dma_ops); > } > - > -void arch_teardown_dma_ops(struct device *dev) > -{ > -} >