From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Date: Fri, 16 Jun 2017 18:10:21 +0000 Subject: [PATCH 06/44] iommu/dma: don't rely on DMA_ERROR_CODE Message-Id: <20170616181059.19206-7-hch@lst.de> List-Id: References: <20170616181059.19206-1-hch@lst.de> In-Reply-To: <20170616181059.19206-1-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 Cc: linux-kernel@vger.kernel.org DMA_ERROR_CODE is not a public API and will go away soon. dma dma-iommu driver already implements a proper ->mapping_error method, so it's only using the value internally. Add a new local define using the value that arm64 which is the only current user of dma-iommu. Signed-off-by: Christoph Hellwig --- drivers/iommu/dma-iommu.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 62618e77bedc..9403336f1fa6 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -31,6 +31,8 @@ #include #include +#define IOMMU_MAPPING_ERROR 0 + struct iommu_dma_msi_page { struct list_head list; dma_addr_t iova; @@ -500,7 +502,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size, { __iommu_dma_unmap(iommu_get_domain_for_dev(dev), *handle, size); __iommu_dma_free_pages(pages, PAGE_ALIGN(size) >> PAGE_SHIFT); - *handle = DMA_ERROR_CODE; + *handle = IOMMU_MAPPING_ERROR; } /** @@ -533,7 +535,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, dma_addr_t iova; unsigned int count, min_size, alloc_sizes = domain->pgsize_bitmap; - *handle = DMA_ERROR_CODE; + *handle = IOMMU_MAPPING_ERROR; min_size = alloc_sizes & -alloc_sizes; if (min_size < PAGE_SIZE) { @@ -627,11 +629,11 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); if (!iova) - return DMA_ERROR_CODE; + return IOMMU_MAPPING_ERROR; if (iommu_map(domain, iova, phys - iova_off, size, prot)) { iommu_dma_free_iova(cookie, iova, size); - return DMA_ERROR_CODE; + return IOMMU_MAPPING_ERROR; } return iova + iova_off; } @@ -671,7 +673,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents, s->offset += s_iova_off; s->length = s_length; - sg_dma_address(s) = DMA_ERROR_CODE; + sg_dma_address(s) = IOMMU_MAPPING_ERROR; sg_dma_len(s) = 0; /* @@ -714,11 +716,11 @@ static void __invalidate_sg(struct scatterlist *sg, int nents) int i; for_each_sg(sg, s, nents, i) { - if (sg_dma_address(s) != DMA_ERROR_CODE) + if (sg_dma_address(s) != IOMMU_MAPPING_ERROR) s->offset += sg_dma_address(s); if (sg_dma_len(s)) s->length = sg_dma_len(s); - sg_dma_address(s) = DMA_ERROR_CODE; + sg_dma_address(s) = IOMMU_MAPPING_ERROR; sg_dma_len(s) = 0; } } @@ -836,7 +838,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle, int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - return dma_addr = DMA_ERROR_CODE; + return dma_addr = IOMMU_MAPPING_ERROR; } static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 06/44] iommu/dma: don't rely on DMA_ERROR_CODE Date: Fri, 16 Jun 2017 20:10:21 +0200 Message-ID: <20170616181059.19206-7-hch@lst.de> References: <20170616181059.19206-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170616181059.19206-1-hch@lst.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Cc: linux-kernel@vger.kernel.org List-Id: linux-tegra@vger.kernel.org RE1BX0VSUk9SX0NPREUgaXMgbm90IGEgcHVibGljIEFQSSBhbmQgd2lsbCBnbyBhd2F5IHNvb24u ICBkbWEgZG1hLWlvbW11CmRyaXZlciBhbHJlYWR5IGltcGxlbWVudHMgYSBwcm9wZXIgLT5tYXBw aW5nX2Vycm9yIG1ldGhvZCwgc28gaXQncyBvbmx5CnVzaW5nIHRoZSB2YWx1ZSBpbnRlcm5hbGx5 LiAgQWRkIGEgbmV3IGxvY2FsIGRlZmluZSB1c2luZyB0aGUgdmFsdWUKdGhhdCBhcm02NCB3aGlj aCBpcyB0aGUgb25seSBjdXJyZW50IHVzZXIgb2YgZG1hLWlvbW11LgoKU2lnbmVkLW9mZi1ieTog Q2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+Ci0tLQogZHJpdmVycy9pb21tdS9kbWEtaW9t bXUuYyB8IDE4ICsrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlv bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pb21tdS9kbWEtaW9t bXUuYyBiL2RyaXZlcnMvaW9tbXUvZG1hLWlvbW11LmMKaW5kZXggNjI2MThlNzdiZWRjLi45NDAz MzM2ZjFmYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvaW9tbXUvZG1hLWlvbW11LmMKKysrIGIvZHJp dmVycy9pb21tdS9kbWEtaW9tbXUuYwpAQCAtMzEsNiArMzEsOCBAQAogI2luY2x1ZGUgPGxpbnV4 L3NjYXR0ZXJsaXN0Lmg+CiAjaW5jbHVkZSA8bGludXgvdm1hbGxvYy5oPgogCisjZGVmaW5lIElP TU1VX01BUFBJTkdfRVJST1IJMAorCiBzdHJ1Y3QgaW9tbXVfZG1hX21zaV9wYWdlIHsKIAlzdHJ1 Y3QgbGlzdF9oZWFkCWxpc3Q7CiAJZG1hX2FkZHJfdAkJaW92YTsKQEAgLTUwMCw3ICs1MDIsNyBA QCB2b2lkIGlvbW11X2RtYV9mcmVlKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IHBhZ2UgKipw YWdlcywgc2l6ZV90IHNpemUsCiB7CiAJX19pb21tdV9kbWFfdW5tYXAoaW9tbXVfZ2V0X2RvbWFp bl9mb3JfZGV2KGRldiksICpoYW5kbGUsIHNpemUpOwogCV9faW9tbXVfZG1hX2ZyZWVfcGFnZXMo cGFnZXMsIFBBR0VfQUxJR04oc2l6ZSkgPj4gUEFHRV9TSElGVCk7Ci0JKmhhbmRsZSA9IERNQV9F UlJPUl9DT0RFOworCSpoYW5kbGUgPSBJT01NVV9NQVBQSU5HX0VSUk9SOwogfQogCiAvKioKQEAg LTUzMyw3ICs1MzUsNyBAQCBzdHJ1Y3QgcGFnZSAqKmlvbW11X2RtYV9hbGxvYyhzdHJ1Y3QgZGV2 aWNlICpkZXYsIHNpemVfdCBzaXplLCBnZnBfdCBnZnAsCiAJZG1hX2FkZHJfdCBpb3ZhOwogCXVu c2lnbmVkIGludCBjb3VudCwgbWluX3NpemUsIGFsbG9jX3NpemVzID0gZG9tYWluLT5wZ3NpemVf Yml0bWFwOwogCi0JKmhhbmRsZSA9IERNQV9FUlJPUl9DT0RFOworCSpoYW5kbGUgPSBJT01NVV9N QVBQSU5HX0VSUk9SOwogCiAJbWluX3NpemUgPSBhbGxvY19zaXplcyAmIC1hbGxvY19zaXplczsK IAlpZiAobWluX3NpemUgPCBQQUdFX1NJWkUpIHsKQEAgLTYyNywxMSArNjI5LDExIEBAIHN0YXRp YyBkbWFfYWRkcl90IF9faW9tbXVfZG1hX21hcChzdHJ1Y3QgZGV2aWNlICpkZXYsIHBoeXNfYWRk cl90IHBoeXMsCiAKIAlpb3ZhID0gaW9tbXVfZG1hX2FsbG9jX2lvdmEoZG9tYWluLCBzaXplLCBk bWFfZ2V0X21hc2soZGV2KSwgZGV2KTsKIAlpZiAoIWlvdmEpCi0JCXJldHVybiBETUFfRVJST1Jf Q09ERTsKKwkJcmV0dXJuIElPTU1VX01BUFBJTkdfRVJST1I7CiAKIAlpZiAoaW9tbXVfbWFwKGRv bWFpbiwgaW92YSwgcGh5cyAtIGlvdmFfb2ZmLCBzaXplLCBwcm90KSkgewogCQlpb21tdV9kbWFf ZnJlZV9pb3ZhKGNvb2tpZSwgaW92YSwgc2l6ZSk7Ci0JCXJldHVybiBETUFfRVJST1JfQ09ERTsK KwkJcmV0dXJuIElPTU1VX01BUFBJTkdfRVJST1I7CiAJfQogCXJldHVybiBpb3ZhICsgaW92YV9v ZmY7CiB9CkBAIC02NzEsNyArNjczLDcgQEAgc3RhdGljIGludCBfX2ZpbmFsaXNlX3NnKHN0cnVj dCBkZXZpY2UgKmRldiwgc3RydWN0IHNjYXR0ZXJsaXN0ICpzZywgaW50IG5lbnRzLAogCiAJCXMt Pm9mZnNldCArPSBzX2lvdmFfb2ZmOwogCQlzLT5sZW5ndGggPSBzX2xlbmd0aDsKLQkJc2dfZG1h X2FkZHJlc3MocykgPSBETUFfRVJST1JfQ09ERTsKKwkJc2dfZG1hX2FkZHJlc3MocykgPSBJT01N VV9NQVBQSU5HX0VSUk9SOwogCQlzZ19kbWFfbGVuKHMpID0gMDsKIAogCQkvKgpAQCAtNzE0LDEx ICs3MTYsMTEgQEAgc3RhdGljIHZvaWQgX19pbnZhbGlkYXRlX3NnKHN0cnVjdCBzY2F0dGVybGlz dCAqc2csIGludCBuZW50cykKIAlpbnQgaTsKIAogCWZvcl9lYWNoX3NnKHNnLCBzLCBuZW50cywg aSkgewotCQlpZiAoc2dfZG1hX2FkZHJlc3MocykgIT0gRE1BX0VSUk9SX0NPREUpCisJCWlmIChz Z19kbWFfYWRkcmVzcyhzKSAhPSBJT01NVV9NQVBQSU5HX0VSUk9SKQogCQkJcy0+b2Zmc2V0ICs9 IHNnX2RtYV9hZGRyZXNzKHMpOwogCQlpZiAoc2dfZG1hX2xlbihzKSkKIAkJCXMtPmxlbmd0aCA9 IHNnX2RtYV9sZW4ocyk7Ci0JCXNnX2RtYV9hZGRyZXNzKHMpID0gRE1BX0VSUk9SX0NPREU7CisJ CXNnX2RtYV9hZGRyZXNzKHMpID0gSU9NTVVfTUFQUElOR19FUlJPUjsKIAkJc2dfZG1hX2xlbihz KSA9IDA7CiAJfQogfQpAQCAtODM2LDcgKzgzOCw3IEBAIHZvaWQgaW9tbXVfZG1hX3VubWFwX3Jl c291cmNlKHN0cnVjdCBkZXZpY2UgKmRldiwgZG1hX2FkZHJfdCBoYW5kbGUsCiAKIGludCBpb21t dV9kbWFfbWFwcGluZ19lcnJvcihzdHJ1Y3QgZGV2aWNlICpkZXYsIGRtYV9hZGRyX3QgZG1hX2Fk ZHIpCiB7Ci0JcmV0dXJuIGRtYV9hZGRyID09IERNQV9FUlJPUl9DT0RFOworCXJldHVybiBkbWFf YWRkciA9PSBJT01NVV9NQVBQSU5HX0VSUk9SOwogfQogCiBzdGF0aWMgc3RydWN0IGlvbW11X2Rt YV9tc2lfcGFnZSAqaW9tbXVfZG1hX2dldF9tc2lfcGFnZShzdHJ1Y3QgZGV2aWNlICpkZXYsCi0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbdFPSLl (ORCPT ); Fri, 16 Jun 2017 14:11:41 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:50740 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752746AbdFPSLi (ORCPT ); Fri, 16 Jun 2017 14:11:38 -0400 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 Cc: linux-kernel@vger.kernel.org Subject: [PATCH 06/44] iommu/dma: don't rely on DMA_ERROR_CODE Date: Fri, 16 Jun 2017 20:10:21 +0200 Message-Id: <20170616181059.19206-7-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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org DMA_ERROR_CODE is not a public API and will go away soon. dma dma-iommu driver already implements a proper ->mapping_error method, so it's only using the value internally. Add a new local define using the value that arm64 which is the only current user of dma-iommu. Signed-off-by: Christoph Hellwig --- drivers/iommu/dma-iommu.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 62618e77bedc..9403336f1fa6 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -31,6 +31,8 @@ #include #include +#define IOMMU_MAPPING_ERROR 0 + struct iommu_dma_msi_page { struct list_head list; dma_addr_t iova; @@ -500,7 +502,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size, { __iommu_dma_unmap(iommu_get_domain_for_dev(dev), *handle, size); __iommu_dma_free_pages(pages, PAGE_ALIGN(size) >> PAGE_SHIFT); - *handle = DMA_ERROR_CODE; + *handle = IOMMU_MAPPING_ERROR; } /** @@ -533,7 +535,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, dma_addr_t iova; unsigned int count, min_size, alloc_sizes = domain->pgsize_bitmap; - *handle = DMA_ERROR_CODE; + *handle = IOMMU_MAPPING_ERROR; min_size = alloc_sizes & -alloc_sizes; if (min_size < PAGE_SIZE) { @@ -627,11 +629,11 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); if (!iova) - return DMA_ERROR_CODE; + return IOMMU_MAPPING_ERROR; if (iommu_map(domain, iova, phys - iova_off, size, prot)) { iommu_dma_free_iova(cookie, iova, size); - return DMA_ERROR_CODE; + return IOMMU_MAPPING_ERROR; } return iova + iova_off; } @@ -671,7 +673,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents, s->offset += s_iova_off; s->length = s_length; - sg_dma_address(s) = DMA_ERROR_CODE; + sg_dma_address(s) = IOMMU_MAPPING_ERROR; sg_dma_len(s) = 0; /* @@ -714,11 +716,11 @@ static void __invalidate_sg(struct scatterlist *sg, int nents) int i; for_each_sg(sg, s, nents, i) { - if (sg_dma_address(s) != DMA_ERROR_CODE) + if (sg_dma_address(s) != IOMMU_MAPPING_ERROR) s->offset += sg_dma_address(s); if (sg_dma_len(s)) s->length = sg_dma_len(s); - sg_dma_address(s) = DMA_ERROR_CODE; + sg_dma_address(s) = IOMMU_MAPPING_ERROR; sg_dma_len(s) = 0; } } @@ -836,7 +838,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle, int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - return dma_addr == DMA_ERROR_CODE; + return dma_addr == IOMMU_MAPPING_ERROR; } static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: hch@lst.de (Christoph Hellwig) Date: Fri, 16 Jun 2017 20:10:21 +0200 Subject: [PATCH 06/44] iommu/dma: don't rely on DMA_ERROR_CODE In-Reply-To: <20170616181059.19206-1-hch@lst.de> References: <20170616181059.19206-1-hch@lst.de> Message-ID: <20170616181059.19206-7-hch@lst.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org DMA_ERROR_CODE is not a public API and will go away soon. dma dma-iommu driver already implements a proper ->mapping_error method, so it's only using the value internally. Add a new local define using the value that arm64 which is the only current user of dma-iommu. Signed-off-by: Christoph Hellwig --- drivers/iommu/dma-iommu.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 62618e77bedc..9403336f1fa6 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -31,6 +31,8 @@ #include #include +#define IOMMU_MAPPING_ERROR 0 + struct iommu_dma_msi_page { struct list_head list; dma_addr_t iova; @@ -500,7 +502,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size, { __iommu_dma_unmap(iommu_get_domain_for_dev(dev), *handle, size); __iommu_dma_free_pages(pages, PAGE_ALIGN(size) >> PAGE_SHIFT); - *handle = DMA_ERROR_CODE; + *handle = IOMMU_MAPPING_ERROR; } /** @@ -533,7 +535,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, dma_addr_t iova; unsigned int count, min_size, alloc_sizes = domain->pgsize_bitmap; - *handle = DMA_ERROR_CODE; + *handle = IOMMU_MAPPING_ERROR; min_size = alloc_sizes & -alloc_sizes; if (min_size < PAGE_SIZE) { @@ -627,11 +629,11 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev); if (!iova) - return DMA_ERROR_CODE; + return IOMMU_MAPPING_ERROR; if (iommu_map(domain, iova, phys - iova_off, size, prot)) { iommu_dma_free_iova(cookie, iova, size); - return DMA_ERROR_CODE; + return IOMMU_MAPPING_ERROR; } return iova + iova_off; } @@ -671,7 +673,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents, s->offset += s_iova_off; s->length = s_length; - sg_dma_address(s) = DMA_ERROR_CODE; + sg_dma_address(s) = IOMMU_MAPPING_ERROR; sg_dma_len(s) = 0; /* @@ -714,11 +716,11 @@ static void __invalidate_sg(struct scatterlist *sg, int nents) int i; for_each_sg(sg, s, nents, i) { - if (sg_dma_address(s) != DMA_ERROR_CODE) + if (sg_dma_address(s) != IOMMU_MAPPING_ERROR) s->offset += sg_dma_address(s); if (sg_dma_len(s)) s->length = sg_dma_len(s); - sg_dma_address(s) = DMA_ERROR_CODE; + sg_dma_address(s) = IOMMU_MAPPING_ERROR; sg_dma_len(s) = 0; } } @@ -836,7 +838,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle, int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - return dma_addr == DMA_ERROR_CODE; + return dma_addr == IOMMU_MAPPING_ERROR; } static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev, -- 2.11.0