From patchwork Fri Jun 16 18:10:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9792665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 041FE60326 for ; Fri, 16 Jun 2017 18:13:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1BBB2625B for ; Fri, 16 Jun 2017 18:13:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4E6A2866B; Fri, 16 Jun 2017 18:13:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8E4AB2625B for ; Fri, 16 Jun 2017 18:13:55 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvjE-0008QO-Tw; Fri, 16 Jun 2017 18:12:16 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dLvjE-0008P5-4U for xen-devel@lists.xenproject.org; Fri, 16 Jun 2017 18:12:16 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 07/56-06719-F7F14495; Fri, 16 Jun 2017 18:12:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKLMWRWlGSWpSXmKPExsXiaHS5VbdO3iX SYMMqFYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePMupcsBRdFKv69vMfewHhMsIuRi4NF4ASb xMmeZiYQR0jgBKPEsdZDjF2MnBxsAioSb573sIMkRAQOsUicfHOUCSTBLKAg8eveJlYQW1jAW uLk4QNgDSwCqhJ/P39lAbF5BQwkrpyaxAxiSwjIS+xquwhWzwkU/3lkG1i9kIC+xJSbdxlBFk gItDBKtF1cwTKBkWcBI8MqRo3i1KKy1CJdIxO9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK 95PzcTYxA7zMAwQ7GfR8jDzFKcjApifK+f+IcKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCd7Kc S6SQYFFqempFWmYOMAxh0hIcPEoivPv5gNK8xQWJucWZ6RCpU4yKUuK8DiB9AiCJjNI8uDZY6 F9ilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMG+3DNAUnsy8Erjpr4AWMwEtDrrgALK4JBEhJd XAKKkoMU81d8Fzq57MaQI3t/9LnLdsW8vCB9N9DnQvi73UNDf4/VNJuaCs3oJ7X/r7F9WmOFy ZPcnu4+TOn5KFsw3v6236+c/1Z8c3C32hyIajLj7Bh0+x5J9RneHB6MwUlHkvM7Uh/nqLLU92 z787ex/UsQs2Wv2amZcTfkD9mF1ywY0vmi1flFiKMxINtZiLihMBXbqCDHgCAAA= X-Env-Sender: BATV+48ca1ab4adaecdf09dc3+5045+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1497636733!67625482!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14183 invoked from network); 16 Jun 2017 18:12:14 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-14.tower-21.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 16 Jun 2017 18:12:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1dtxUOxP7ZlKqBs8WTsw3wVNwLvNEAwp0in+GBgczaI=; b=EPMyhyQjO/q0CE6xKavgOu/N0 I7rfI+HdFYeoTkqQ4EYHVg9y+u2Z0ndkfugoYAD28vwvAUDgreApM7RGBhQ4/923Rno+qfETucUm6 oYhdaXhekcXCTHW6DhmVzUE8JPSAiW98vUF8IQE4Ckm+CWniRxAmE18WWcHQXdivls5sj0kHtSBRb bBrsfOfkYlNBPmT6fxfSgFebEThI3ZzsKbdfoc8DwIZMQQi0si336d0E5qpPOG46uxXuHa1KnkfgS dEd7KdSmifgmVynoloWcfg7v0lhm8fwVfHlmXg1TNmg2HWuhzRDS3J4HDinQoZJGAZ0kTjV9M9pAy s9UQjg7qw==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dLvj9-0005Pq-5y; Fri, 16 Jun 2017 18:12:11 +0000 From: Christoph Hellwig To: x86@kernel.org, linux-arm-kernel@lists.infradead.org, xen-devel@lists.xenproject.org, linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, openrisc@lists.librecores.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org, dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, iommu@lists.linux-foundation.org, netdev@vger.kernel.org Date: Fri, 16 Jun 2017 20:10:33 +0200 Message-Id: <20170616181059.19206-19-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170616181059.19206-1-hch@lst.de> References: <20170616181059.19206-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Cc: linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH 18/44] iommu/amd: implement ->mapping_error X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP DMA_ERROR_CODE is going to go away, so don't rely on it. Signed-off-by: Christoph Hellwig --- drivers/iommu/amd_iommu.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 63cacf5d6cf2..d41280e869de 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -54,6 +54,8 @@ #include "amd_iommu_types.h" #include "irq_remapping.h" +#define AMD_IOMMU_MAPPING_ERROR 0 + #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28)) #define LOOP_TIMEOUT 100000 @@ -2394,7 +2396,7 @@ static dma_addr_t __map_single(struct device *dev, paddr &= PAGE_MASK; address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask); - if (address == DMA_ERROR_CODE) + if (address == AMD_IOMMU_MAPPING_ERROR) goto out; prot = dir2prot(direction); @@ -2431,7 +2433,7 @@ static dma_addr_t __map_single(struct device *dev, dma_ops_free_iova(dma_dom, address, pages); - return DMA_ERROR_CODE; + return AMD_IOMMU_MAPPING_ERROR; } /* @@ -2483,7 +2485,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page, if (PTR_ERR(domain) == -EINVAL) return (dma_addr_t)paddr; else if (IS_ERR(domain)) - return DMA_ERROR_CODE; + return AMD_IOMMU_MAPPING_ERROR; dma_mask = *dev->dma_mask; dma_dom = to_dma_ops_domain(domain); @@ -2560,7 +2562,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, npages = sg_num_pages(dev, sglist, nelems); address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask); - if (address == DMA_ERROR_CODE) + if (address == AMD_IOMMU_MAPPING_ERROR) goto out_err; prot = dir2prot(direction); @@ -2683,7 +2685,7 @@ static void *alloc_coherent(struct device *dev, size_t size, *dma_addr = __map_single(dev, dma_dom, page_to_phys(page), size, DMA_BIDIRECTIONAL, dma_mask); - if (*dma_addr == DMA_ERROR_CODE) + if (*dma_addr == AMD_IOMMU_MAPPING_ERROR) goto out_free; return page_address(page); @@ -2732,6 +2734,11 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask) return check_device(dev); } +static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return dma_addr == AMD_IOMMU_MAPPING_ERROR; +} + static const struct dma_map_ops amd_iommu_dma_ops = { .alloc = alloc_coherent, .free = free_coherent, @@ -2740,6 +2747,7 @@ static const struct dma_map_ops amd_iommu_dma_ops = { .map_sg = map_sg, .unmap_sg = unmap_sg, .dma_supported = amd_iommu_dma_supported, + .mapping_error = amd_iommu_mapping_error, }; static int init_reserved_iova_ranges(void)