From patchwork Thu Jun 8 13:25: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: 9774785 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 5FE1660393 for ; Thu, 8 Jun 2017 13:29:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5241328520 for ; Thu, 8 Jun 2017 13:29:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4602228531; Thu, 8 Jun 2017 13:29:00 +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=ham 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 3ACB228451 for ; Thu, 8 Jun 2017 13:28:59 +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 1dIxSk-0003K5-68; Thu, 08 Jun 2017 13:26:58 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIxSi-0003IH-W2 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 13:26:57 +0000 Received: from [193.109.254.147] by server-1.bemta-6.messagelabs.com id 0E/96-06719-0A059395; Thu, 08 Jun 2017 13:26:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXiaHS5VXd+gGW kwYtZkhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8a/H7cYC37wVSztlW9g/MLTxcjFwSJwgk1i 4pTZ7F2MnBxCAicYJfqe84DYbAIqEm+e97CDFIkIHGKROPnmKBNIgllAQeLXvU2sXYwcHMICt hJXjhmDhFkEVCU2TFzOCmLzCuhL7JnSywZiSwjIS+xquwgW5xQwkGg5vYsJYpe+xKEF05hB5k sItDBKtF1cwTKBkWcBI8MqRvXi1KKy1CJdM72kosz0jJLcxMwcXUMDM73c1OLixPTUnMSkYr3 k/NxNjECvMwDBDsZ5J/wPMUpyMCmJ8ioKWEYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuC94Q+U EyxKTU+tSMvMAYYfTFqCg0dJhPe/D1Cat7ggMbc4Mx0idYpRl2PD6vVfmIRY8vLzUqXEee+Cz BAAKcoozYMbAYuFS4yyUsK8jEBHCfEUpBblZpagyr9iFOdgVBLmdfMFmsKTmVcCt+kV0BFMQE cseWcBckRJIkJKqoHx4tR/P2ureY/PsTsburXb9pklA//RkDuLpSTu+cZemmn0PyBIsW1XQJb Fz1BufmfB/mUZ26S+V0qkbbkfWlz0yeZN376EN6csrqxN9jQ631QquOVShMa1XP7KiAsGUo2P Fcr7fi/N6xHTStcJPCS75PnDqmIe48YVkgsY3HRrljSyvvQ906PEUpyRaKjFXFScCABcE+CBg AIAAA== X-Env-Sender: BATV+eb06f239ea6f59aeb59b+5037+infradead.org+hch@bombadil.s rs.infradead.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1496928413!94287381!1 X-Originating-IP: [65.50.211.133] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1308 invoked from network); 8 Jun 2017 13:26:55 -0000 Received: from bombadil.infradead.org (HELO bombadil.infradead.org) (65.50.211.133) by server-14.tower-27.messagelabs.com with AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2017 13:26:55 -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=vTzoM7J9JqaEJB5GCYD40QbDafafNo997nHJCC9zKZk=; b=lKNA0j9T+WRAOR9oDKBt5EZyG WtRyYmB4xPTQO7iH0H2AeGKgr+oPJyM84Q7sppd9EprD05SpXgUjiJ2A+xvdihq+HYyrXQ88YXHA5 0yLKlVU78CbDPwNSPfta7UfcqyAm7PzRPbPiElOL+R8rNeM5pV43lzeUKCTCnHw+rd3M5MUnCtzoY B+vUE0gsWlh+Axd+DjDPdNvIfAfWH97eQX5ZL9uft6e8UTDJ4fi7kMLdRoj4wwzFLEv8GW4DuQRKY jby3zU32aISC6M9/HpmWlmIDf3t9OHN1YcQr4fS763OySU9HsjFUbgcZtE57PxZMFkJaZO7Ujx1Um ja9xCxmOg==; 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 1dIxSa-0005RU-Ko; Thu, 08 Jun 2017 13:26:49 +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: Thu, 8 Jun 2017 15:25:33 +0200 Message-Id: <20170608132609.32662-9-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608132609.32662-1-hch@lst.de> References: <20170608132609.32662-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 08/44] xen-swiotlb: 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 Reviewed-by: Konrad Rzeszutek Wilk --- drivers/xen/swiotlb-xen.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index a0f006daab48..c3a04b2d7532 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -67,6 +67,8 @@ static unsigned long dma_alloc_coherent_mask(struct device *dev, } #endif +#define XEN_SWIOTLB_ERROR_CODE (~(dma_addr_t)0x0) + static char *xen_io_tlb_start, *xen_io_tlb_end; static unsigned long xen_io_tlb_nslabs; /* @@ -410,7 +412,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, map = swiotlb_tbl_map_single(dev, start_dma_addr, phys, size, dir, attrs); if (map == SWIOTLB_MAP_ERROR) - return DMA_ERROR_CODE; + return XEN_SWIOTLB_ERROR_CODE; dev_addr = xen_phys_to_bus(map); xen_dma_map_page(dev, pfn_to_page(map >> PAGE_SHIFT), @@ -425,7 +427,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, attrs |= DMA_ATTR_SKIP_CPU_SYNC; swiotlb_tbl_unmap_single(dev, map, size, dir, attrs); - return DMA_ERROR_CODE; + return XEN_SWIOTLB_ERROR_CODE; } /* @@ -715,6 +717,11 @@ xen_swiotlb_get_sgtable(struct device *dev, struct sg_table *sgt, return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size); } +static int xen_swiotlb_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return dma_addr == XEN_SWIOTLB_ERROR_CODE; +} + const struct dma_map_ops xen_swiotlb_dma_ops = { .alloc = xen_swiotlb_alloc_coherent, .free = xen_swiotlb_free_coherent, @@ -730,4 +737,5 @@ const struct dma_map_ops xen_swiotlb_dma_ops = { .set_dma_mask = xen_swiotlb_set_dma_mask, .mmap = xen_swiotlb_dma_mmap, .get_sgtable = xen_swiotlb_get_sgtable, + .mapping_error = xen_swiotlb_mapping_error, };