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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 E1156C10F0E for ; Tue, 9 Apr 2019 15:54:38 +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 B00582084C for ; Tue, 9 Apr 2019 15:54:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UGL30KWX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B00582084C 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-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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iQmosMXbQDjIxp5Lwldpa4wpfYtjH3lGoInmnfuf2iw=; b=UGL30KWXHqppDsDn0DB3dt9uG c6lao2rU0xmmG5TL76rBPzuiIujQTBMEQnbx/sTww0wIjd7WoJbWv2pZ8S+lRrOH07vQuJufMQupR n6GyFN/Uf7roREyjQZBdxYae7QrplpuG+5aA369+MVHahtKJFv5MZeGK7XqENsJ3kMAiYOO5Vt6mL 3Vhq4rBaDtohBedfgiFyJktQrZVfd2EqtW/RtArTN0XgZ0FmzRdLHpO/4lB72y0kcgkIYokB6NbdS 86Cx/7uEaOEbRYzcxWkwfJOgJhKyiNOtuy9U6MvdsNhsSOawRc7eGYjE5EyOPcX384xjgJVtP//t5 oqNEEwudg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDt53-00052h-Lx; Tue, 09 Apr 2019 15:54:37 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDt50-00052N-Rq for linux-arm-kernel@lists.infradead.org; Tue, 09 Apr 2019 15:54:36 +0000 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 34DDC15AB; Tue, 9 Apr 2019 08:54:34 -0700 (PDT) Received: from [10.1.196.75] (e110467-lin.cambridge.arm.com [10.1.196.75]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C84473F68F; Tue, 9 Apr 2019 08:54:32 -0700 (PDT) Subject: Re: [PATCH 10/21] dma-iommu: move __iommu_dma_map To: Christoph Hellwig References: <20190327080448.5500-1-hch@lst.de> <20190327080448.5500-11-hch@lst.de> From: Robin Murphy Message-ID: Date: Tue, 9 Apr 2019 16:54:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190327080448.5500-11-hch@lst.de> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190409_085434_903743_AD4A8CE6 X-CRM114-Status: GOOD ( 22.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Lendacky , Catalin Marinas , Joerg Roedel , Will Deacon , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 27/03/2019 08:04, Christoph Hellwig wrote: > Moving this function up to its unmap counterpart helps to keep related > code together for the following changes. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/dma-iommu.c | 46 +++++++++++++++++++-------------------- > 1 file changed, 23 insertions(+), 23 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 57f2d8621112..4d46beeea5b7 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -435,6 +435,29 @@ static void __iommu_dma_unmap(struct iommu_domain *domain, dma_addr_t dma_addr, > iommu_dma_free_iova(cookie, dma_addr, size); > } > > +static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, > + size_t size, int prot, struct iommu_domain *domain) > +{ > + struct iommu_dma_cookie *cookie = domain->iova_cookie; > + size_t iova_off = 0; > + dma_addr_t iova; > + > + if (cookie->type == IOMMU_DMA_IOVA_COOKIE) { > + iova_off = iova_offset(&cookie->iovad, phys); > + size = iova_align(&cookie->iovad, size + iova_off); > + } > + > + iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); > + if (!iova) > + return DMA_MAPPING_ERROR; > + > + if (iommu_map(domain, iova, phys - iova_off, size, prot)) { > + iommu_dma_free_iova(cookie, iova, size); > + return DMA_MAPPING_ERROR; > + } > + return iova + iova_off; > +} > + > static void __iommu_dma_free_pages(struct page **pages, int count) > { > while (count--) > @@ -689,29 +712,6 @@ static void iommu_dma_sync_sg_for_device(struct device *dev, > arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir); > } > > -static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, > - size_t size, int prot, struct iommu_domain *domain) > -{ > - struct iommu_dma_cookie *cookie = domain->iova_cookie; > - size_t iova_off = 0; > - dma_addr_t iova; > - > - if (cookie->type == IOMMU_DMA_IOVA_COOKIE) { > - iova_off = iova_offset(&cookie->iovad, phys); > - size = iova_align(&cookie->iovad, size + iova_off); > - } > - > - iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); > - if (!iova) > - return DMA_MAPPING_ERROR; > - > - if (iommu_map(domain, iova, phys - iova_off, size, prot)) { > - iommu_dma_free_iova(cookie, iova, size); > - return DMA_MAPPING_ERROR; > - } > - return iova + iova_off; > -} > - > static dma_addr_t __iommu_dma_map_page(struct device *dev, struct page *page, > unsigned long offset, size_t size, int prot) > { > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel