From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Date: Fri, 16 Jun 2017 18:10:38 +0000 Subject: [PATCH 23/44] x86/calgary: implement ->mapping_error Message-Id: <20170616181059.19206-24-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 going to go away, so don't rely on it. Signed-off-by: Christoph Hellwig --- arch/x86/kernel/pci-calgary_64.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index fda7867046d0..e75b490f2b0b 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -50,6 +50,8 @@ #include #include +#define CALGARY_MAPPING_ERROR 0 + #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT int use_calgary __read_mostly = 1; #else @@ -252,7 +254,7 @@ static unsigned long iommu_range_alloc(struct device *dev, if (panic_on_overflow) panic("Calgary: fix the allocator.\n"); else - return DMA_ERROR_CODE; + return CALGARY_MAPPING_ERROR; } } @@ -272,10 +274,10 @@ static dma_addr_t iommu_alloc(struct device *dev, struct iommu_table *tbl, entry = iommu_range_alloc(dev, tbl, npages); - if (unlikely(entry = DMA_ERROR_CODE)) { + if (unlikely(entry = CALGARY_MAPPING_ERROR)) { pr_warn("failed to allocate %u pages in iommu %p\n", npages, tbl); - return DMA_ERROR_CODE; + return CALGARY_MAPPING_ERROR; } /* set the return dma address */ @@ -295,7 +297,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, unsigned long flags; /* were we called with bad_dma_address? */ - badend = DMA_ERROR_CODE + (EMERGENCY_PAGES * PAGE_SIZE); + badend = CALGARY_MAPPING_ERROR + (EMERGENCY_PAGES * PAGE_SIZE); if (unlikely(dma_addr < badend)) { WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n", dma_addr); @@ -380,7 +382,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE); entry = iommu_range_alloc(dev, tbl, npages); - if (entry = DMA_ERROR_CODE) { + if (entry = CALGARY_MAPPING_ERROR) { /* makes sure unmap knows to stop */ s->dma_length = 0; goto error; @@ -398,7 +400,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, error: calgary_unmap_sg(dev, sg, nelems, dir, 0); for_each_sg(sg, s, nelems, i) { - sg->dma_address = DMA_ERROR_CODE; + sg->dma_address = CALGARY_MAPPING_ERROR; sg->dma_length = 0; } return 0; @@ -453,7 +455,7 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, /* set up tces to cover the allocated range */ mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL); - if (mapping = DMA_ERROR_CODE) + if (mapping = CALGARY_MAPPING_ERROR) goto free; *dma_handle = mapping; return ret; @@ -478,6 +480,11 @@ static void calgary_free_coherent(struct device *dev, size_t size, free_pages((unsigned long)vaddr, get_order(size)); } +static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return dma_addr = CALGARY_MAPPING_ERROR; +} + static const struct dma_map_ops calgary_dma_ops = { .alloc = calgary_alloc_coherent, .free = calgary_free_coherent, @@ -485,6 +492,7 @@ static const struct dma_map_ops calgary_dma_ops = { .unmap_sg = calgary_unmap_sg, .map_page = calgary_map_page, .unmap_page = calgary_unmap_page, + .mapping_error = calgary_mapping_error, }; static inline void __iomem * busno_to_bbar(unsigned char num) @@ -732,7 +740,7 @@ static void __init calgary_reserve_regions(struct pci_dev *dev) struct iommu_table *tbl = pci_iommu(dev->bus); /* reserve EMERGENCY_PAGES from bad_dma_address and up */ - iommu_range_reserve(tbl, DMA_ERROR_CODE, EMERGENCY_PAGES); + iommu_range_reserve(tbl, CALGARY_MAPPING_ERROR, EMERGENCY_PAGES); /* avoid the BIOS/VGA first 640KB-1MB region */ /* for CalIOC2 - avoid the entire first MB */ -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 23/44] x86/calgary: implement ->mapping_error Date: Fri, 16 Jun 2017 20:10:38 +0200 Message-ID: <20170616181059.19206-24-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-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-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 RE1BX0VSUk9SX0NPREUgaXMgZ29pbmcgdG8gZ28gYXdheSwgc28gZG9uJ3QgcmVseSBvbiBpdC4K ClNpZ25lZC1vZmYtYnk6IENocmlzdG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgotLS0KIGFyY2gv eDg2L2tlcm5lbC9wY2ktY2FsZ2FyeV82NC5jIHwgMjQgKysrKysrKysrKysrKysrKy0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvcGNpLWNhbGdhcnlfNjQuYyBiL2FyY2gveDg2L2tlcm5l bC9wY2ktY2FsZ2FyeV82NC5jCmluZGV4IGZkYTc4NjcwNDZkMC4uZTc1YjQ5MGYyYjBiIDEwMDY0 NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvcGNpLWNhbGdhcnlfNjQuYworKysgYi9hcmNoL3g4Ni9r ZXJuZWwvcGNpLWNhbGdhcnlfNjQuYwpAQCAtNTAsNiArNTAsOCBAQAogI2luY2x1ZGUgPGFzbS94 ODZfaW5pdC5oPgogI2luY2x1ZGUgPGFzbS9pb21tdV90YWJsZS5oPgogCisjZGVmaW5lIENBTEdB UllfTUFQUElOR19FUlJPUgkwCisKICNpZmRlZiBDT05GSUdfQ0FMR0FSWV9JT01NVV9FTkFCTEVE X0JZX0RFRkFVTFQKIGludCB1c2VfY2FsZ2FyeSBfX3JlYWRfbW9zdGx5ID0gMTsKICNlbHNlCkBA IC0yNTIsNyArMjU0LDcgQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcgaW9tbXVfcmFuZ2VfYWxsb2Mo c3RydWN0IGRldmljZSAqZGV2LAogCQkJaWYgKHBhbmljX29uX292ZXJmbG93KQogCQkJCXBhbmlj KCJDYWxnYXJ5OiBmaXggdGhlIGFsbG9jYXRvci5cbiIpOwogCQkJZWxzZQotCQkJCXJldHVybiBE TUFfRVJST1JfQ09ERTsKKwkJCQlyZXR1cm4gQ0FMR0FSWV9NQVBQSU5HX0VSUk9SOwogCQl9CiAJ fQogCkBAIC0yNzIsMTAgKzI3NCwxMCBAQCBzdGF0aWMgZG1hX2FkZHJfdCBpb21tdV9hbGxvYyhz dHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBpb21tdV90YWJsZSAqdGJsLAogCiAJZW50cnkgPSBp b21tdV9yYW5nZV9hbGxvYyhkZXYsIHRibCwgbnBhZ2VzKTsKIAotCWlmICh1bmxpa2VseShlbnRy eSA9PSBETUFfRVJST1JfQ09ERSkpIHsKKwlpZiAodW5saWtlbHkoZW50cnkgPT0gQ0FMR0FSWV9N QVBQSU5HX0VSUk9SKSkgewogCQlwcl93YXJuKCJmYWlsZWQgdG8gYWxsb2NhdGUgJXUgcGFnZXMg aW4gaW9tbXUgJXBcbiIsCiAJCQlucGFnZXMsIHRibCk7Ci0JCXJldHVybiBETUFfRVJST1JfQ09E RTsKKwkJcmV0dXJuIENBTEdBUllfTUFQUElOR19FUlJPUjsKIAl9CiAKIAkvKiBzZXQgdGhlIHJl dHVybiBkbWEgYWRkcmVzcyAqLwpAQCAtMjk1LDcgKzI5Nyw3IEBAIHN0YXRpYyB2b2lkIGlvbW11 X2ZyZWUoc3RydWN0IGlvbW11X3RhYmxlICp0YmwsIGRtYV9hZGRyX3QgZG1hX2FkZHIsCiAJdW5z aWduZWQgbG9uZyBmbGFnczsKIAogCS8qIHdlcmUgd2UgY2FsbGVkIHdpdGggYmFkX2RtYV9hZGRy ZXNzPyAqLwotCWJhZGVuZCA9IERNQV9FUlJPUl9DT0RFICsgKEVNRVJHRU5DWV9QQUdFUyAqIFBB R0VfU0laRSk7CisJYmFkZW5kID0gQ0FMR0FSWV9NQVBQSU5HX0VSUk9SICsgKEVNRVJHRU5DWV9Q QUdFUyAqIFBBR0VfU0laRSk7CiAJaWYgKHVubGlrZWx5KGRtYV9hZGRyIDwgYmFkZW5kKSkgewog CQlXQVJOKDEsIEtFUk5fRVJSICJDYWxnYXJ5OiBkcml2ZXIgdHJpZWQgdW5tYXBwaW5nIGJhZCBE TUEgIgogCQkgICAgICAgImFkZHJlc3MgMHglTHhcbiIsIGRtYV9hZGRyKTsKQEAgLTM4MCw3ICsz ODIsNyBAQCBzdGF0aWMgaW50IGNhbGdhcnlfbWFwX3NnKHN0cnVjdCBkZXZpY2UgKmRldiwgc3Ry dWN0IHNjYXR0ZXJsaXN0ICpzZywKIAkJbnBhZ2VzID0gaW9tbXVfbnVtX3BhZ2VzKHZhZGRyLCBz LT5sZW5ndGgsIFBBR0VfU0laRSk7CiAKIAkJZW50cnkgPSBpb21tdV9yYW5nZV9hbGxvYyhkZXYs IHRibCwgbnBhZ2VzKTsKLQkJaWYgKGVudHJ5ID09IERNQV9FUlJPUl9DT0RFKSB7CisJCWlmIChl bnRyeSA9PSBDQUxHQVJZX01BUFBJTkdfRVJST1IpIHsKIAkJCS8qIG1ha2VzIHN1cmUgdW5tYXAg a25vd3MgdG8gc3RvcCAqLwogCQkJcy0+ZG1hX2xlbmd0aCA9IDA7CiAJCQlnb3RvIGVycm9yOwpA QCAtMzk4LDcgKzQwMCw3IEBAIHN0YXRpYyBpbnQgY2FsZ2FyeV9tYXBfc2coc3RydWN0IGRldmlj ZSAqZGV2LCBzdHJ1Y3Qgc2NhdHRlcmxpc3QgKnNnLAogZXJyb3I6CiAJY2FsZ2FyeV91bm1hcF9z ZyhkZXYsIHNnLCBuZWxlbXMsIGRpciwgMCk7CiAJZm9yX2VhY2hfc2coc2csIHMsIG5lbGVtcywg aSkgewotCQlzZy0+ZG1hX2FkZHJlc3MgPSBETUFfRVJST1JfQ09ERTsKKwkJc2ctPmRtYV9hZGRy ZXNzID0gQ0FMR0FSWV9NQVBQSU5HX0VSUk9SOwogCQlzZy0+ZG1hX2xlbmd0aCA9IDA7CiAJfQog CXJldHVybiAwOwpAQCAtNDUzLDcgKzQ1NSw3IEBAIHN0YXRpYyB2b2lkKiBjYWxnYXJ5X2FsbG9j X2NvaGVyZW50KHN0cnVjdCBkZXZpY2UgKmRldiwgc2l6ZV90IHNpemUsCiAKIAkvKiBzZXQgdXAg dGNlcyB0byBjb3ZlciB0aGUgYWxsb2NhdGVkIHJhbmdlICovCiAJbWFwcGluZyA9IGlvbW11X2Fs bG9jKGRldiwgdGJsLCByZXQsIG5wYWdlcywgRE1BX0JJRElSRUNUSU9OQUwpOwotCWlmIChtYXBw aW5nID09IERNQV9FUlJPUl9DT0RFKQorCWlmIChtYXBwaW5nID09IENBTEdBUllfTUFQUElOR19F UlJPUikKIAkJZ290byBmcmVlOwogCSpkbWFfaGFuZGxlID0gbWFwcGluZzsKIAlyZXR1cm4gcmV0 OwpAQCAtNDc4LDYgKzQ4MCwxMSBAQCBzdGF0aWMgdm9pZCBjYWxnYXJ5X2ZyZWVfY29oZXJlbnQo c3RydWN0IGRldmljZSAqZGV2LCBzaXplX3Qgc2l6ZSwKIAlmcmVlX3BhZ2VzKCh1bnNpZ25lZCBs b25nKXZhZGRyLCBnZXRfb3JkZXIoc2l6ZSkpOwogfQogCitzdGF0aWMgaW50IGNhbGdhcnlfbWFw cGluZ19lcnJvcihzdHJ1Y3QgZGV2aWNlICpkZXYsIGRtYV9hZGRyX3QgZG1hX2FkZHIpCit7CisJ cmV0dXJuIGRtYV9hZGRyID09IENBTEdBUllfTUFQUElOR19FUlJPUjsKK30KKwogc3RhdGljIGNv bnN0IHN0cnVjdCBkbWFfbWFwX29wcyBjYWxnYXJ5X2RtYV9vcHMgPSB7CiAJLmFsbG9jID0gY2Fs Z2FyeV9hbGxvY19jb2hlcmVudCwKIAkuZnJlZSA9IGNhbGdhcnlfZnJlZV9jb2hlcmVudCwKQEAg LTQ4NSw2ICs0OTIsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRtYV9tYXBfb3BzIGNhbGdhcnlf ZG1hX29wcyA9IHsKIAkudW5tYXBfc2cgPSBjYWxnYXJ5X3VubWFwX3NnLAogCS5tYXBfcGFnZSA9 IGNhbGdhcnlfbWFwX3BhZ2UsCiAJLnVubWFwX3BhZ2UgPSBjYWxnYXJ5X3VubWFwX3BhZ2UsCisJ Lm1hcHBpbmdfZXJyb3IgPSBjYWxnYXJ5X21hcHBpbmdfZXJyb3IsCiB9OwogCiBzdGF0aWMgaW5s aW5lIHZvaWQgX19pb21lbSAqIGJ1c25vX3RvX2JiYXIodW5zaWduZWQgY2hhciBudW0pCkBAIC03 MzIsNyArNzQwLDcgQEAgc3RhdGljIHZvaWQgX19pbml0IGNhbGdhcnlfcmVzZXJ2ZV9yZWdpb25z KHN0cnVjdCBwY2lfZGV2ICpkZXYpCiAJc3RydWN0IGlvbW11X3RhYmxlICp0YmwgPSBwY2lfaW9t bXUoZGV2LT5idXMpOwogCiAJLyogcmVzZXJ2ZSBFTUVSR0VOQ1lfUEFHRVMgZnJvbSBiYWRfZG1h X2FkZHJlc3MgYW5kIHVwICovCi0JaW9tbXVfcmFuZ2VfcmVzZXJ2ZSh0YmwsIERNQV9FUlJPUl9D T0RFLCBFTUVSR0VOQ1lfUEFHRVMpOworCWlvbW11X3JhbmdlX3Jlc2VydmUodGJsLCBDQUxHQVJZ X01BUFBJTkdfRVJST1IsIEVNRVJHRU5DWV9QQUdFUyk7CiAKIAkvKiBhdm9pZCB0aGUgQklPUy9W R0EgZmlyc3QgNjQwS0ItMU1CIHJlZ2lvbiAqLwogCS8qIGZvciBDYWxJT0MyIC0gYXZvaWQgdGhl IGVudGlyZSBmaXJzdCBNQiAqLwotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxA bGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753039AbdFPSU4 (ORCPT ); Fri, 16 Jun 2017 14:20:56 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:50603 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114AbdFPSMj (ORCPT ); Fri, 16 Jun 2017 14:12:39 -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 23/44] x86/calgary: implement ->mapping_error Date: Fri, 16 Jun 2017 20:10:38 +0200 Message-Id: <20170616181059.19206-24-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 going to go away, so don't rely on it. Signed-off-by: Christoph Hellwig --- arch/x86/kernel/pci-calgary_64.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index fda7867046d0..e75b490f2b0b 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -50,6 +50,8 @@ #include #include +#define CALGARY_MAPPING_ERROR 0 + #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT int use_calgary __read_mostly = 1; #else @@ -252,7 +254,7 @@ static unsigned long iommu_range_alloc(struct device *dev, if (panic_on_overflow) panic("Calgary: fix the allocator.\n"); else - return DMA_ERROR_CODE; + return CALGARY_MAPPING_ERROR; } } @@ -272,10 +274,10 @@ static dma_addr_t iommu_alloc(struct device *dev, struct iommu_table *tbl, entry = iommu_range_alloc(dev, tbl, npages); - if (unlikely(entry == DMA_ERROR_CODE)) { + if (unlikely(entry == CALGARY_MAPPING_ERROR)) { pr_warn("failed to allocate %u pages in iommu %p\n", npages, tbl); - return DMA_ERROR_CODE; + return CALGARY_MAPPING_ERROR; } /* set the return dma address */ @@ -295,7 +297,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, unsigned long flags; /* were we called with bad_dma_address? */ - badend = DMA_ERROR_CODE + (EMERGENCY_PAGES * PAGE_SIZE); + badend = CALGARY_MAPPING_ERROR + (EMERGENCY_PAGES * PAGE_SIZE); if (unlikely(dma_addr < badend)) { WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n", dma_addr); @@ -380,7 +382,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE); entry = iommu_range_alloc(dev, tbl, npages); - if (entry == DMA_ERROR_CODE) { + if (entry == CALGARY_MAPPING_ERROR) { /* makes sure unmap knows to stop */ s->dma_length = 0; goto error; @@ -398,7 +400,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, error: calgary_unmap_sg(dev, sg, nelems, dir, 0); for_each_sg(sg, s, nelems, i) { - sg->dma_address = DMA_ERROR_CODE; + sg->dma_address = CALGARY_MAPPING_ERROR; sg->dma_length = 0; } return 0; @@ -453,7 +455,7 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, /* set up tces to cover the allocated range */ mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL); - if (mapping == DMA_ERROR_CODE) + if (mapping == CALGARY_MAPPING_ERROR) goto free; *dma_handle = mapping; return ret; @@ -478,6 +480,11 @@ static void calgary_free_coherent(struct device *dev, size_t size, free_pages((unsigned long)vaddr, get_order(size)); } +static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return dma_addr == CALGARY_MAPPING_ERROR; +} + static const struct dma_map_ops calgary_dma_ops = { .alloc = calgary_alloc_coherent, .free = calgary_free_coherent, @@ -485,6 +492,7 @@ static const struct dma_map_ops calgary_dma_ops = { .unmap_sg = calgary_unmap_sg, .map_page = calgary_map_page, .unmap_page = calgary_unmap_page, + .mapping_error = calgary_mapping_error, }; static inline void __iomem * busno_to_bbar(unsigned char num) @@ -732,7 +740,7 @@ static void __init calgary_reserve_regions(struct pci_dev *dev) struct iommu_table *tbl = pci_iommu(dev->bus); /* reserve EMERGENCY_PAGES from bad_dma_address and up */ - iommu_range_reserve(tbl, DMA_ERROR_CODE, EMERGENCY_PAGES); + iommu_range_reserve(tbl, CALGARY_MAPPING_ERROR, EMERGENCY_PAGES); /* avoid the BIOS/VGA first 640KB-1MB region */ /* for CalIOC2 - avoid the entire first MB */ -- 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:38 +0200 Subject: [PATCH 23/44] x86/calgary: implement ->mapping_error In-Reply-To: <20170616181059.19206-1-hch@lst.de> References: <20170616181059.19206-1-hch@lst.de> Message-ID: <20170616181059.19206-24-hch@lst.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org DMA_ERROR_CODE is going to go away, so don't rely on it. Signed-off-by: Christoph Hellwig --- arch/x86/kernel/pci-calgary_64.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index fda7867046d0..e75b490f2b0b 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -50,6 +50,8 @@ #include #include +#define CALGARY_MAPPING_ERROR 0 + #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT int use_calgary __read_mostly = 1; #else @@ -252,7 +254,7 @@ static unsigned long iommu_range_alloc(struct device *dev, if (panic_on_overflow) panic("Calgary: fix the allocator.\n"); else - return DMA_ERROR_CODE; + return CALGARY_MAPPING_ERROR; } } @@ -272,10 +274,10 @@ static dma_addr_t iommu_alloc(struct device *dev, struct iommu_table *tbl, entry = iommu_range_alloc(dev, tbl, npages); - if (unlikely(entry == DMA_ERROR_CODE)) { + if (unlikely(entry == CALGARY_MAPPING_ERROR)) { pr_warn("failed to allocate %u pages in iommu %p\n", npages, tbl); - return DMA_ERROR_CODE; + return CALGARY_MAPPING_ERROR; } /* set the return dma address */ @@ -295,7 +297,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, unsigned long flags; /* were we called with bad_dma_address? */ - badend = DMA_ERROR_CODE + (EMERGENCY_PAGES * PAGE_SIZE); + badend = CALGARY_MAPPING_ERROR + (EMERGENCY_PAGES * PAGE_SIZE); if (unlikely(dma_addr < badend)) { WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA " "address 0x%Lx\n", dma_addr); @@ -380,7 +382,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE); entry = iommu_range_alloc(dev, tbl, npages); - if (entry == DMA_ERROR_CODE) { + if (entry == CALGARY_MAPPING_ERROR) { /* makes sure unmap knows to stop */ s->dma_length = 0; goto error; @@ -398,7 +400,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, error: calgary_unmap_sg(dev, sg, nelems, dir, 0); for_each_sg(sg, s, nelems, i) { - sg->dma_address = DMA_ERROR_CODE; + sg->dma_address = CALGARY_MAPPING_ERROR; sg->dma_length = 0; } return 0; @@ -453,7 +455,7 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, /* set up tces to cover the allocated range */ mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL); - if (mapping == DMA_ERROR_CODE) + if (mapping == CALGARY_MAPPING_ERROR) goto free; *dma_handle = mapping; return ret; @@ -478,6 +480,11 @@ static void calgary_free_coherent(struct device *dev, size_t size, free_pages((unsigned long)vaddr, get_order(size)); } +static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return dma_addr == CALGARY_MAPPING_ERROR; +} + static const struct dma_map_ops calgary_dma_ops = { .alloc = calgary_alloc_coherent, .free = calgary_free_coherent, @@ -485,6 +492,7 @@ static const struct dma_map_ops calgary_dma_ops = { .unmap_sg = calgary_unmap_sg, .map_page = calgary_map_page, .unmap_page = calgary_unmap_page, + .mapping_error = calgary_mapping_error, }; static inline void __iomem * busno_to_bbar(unsigned char num) @@ -732,7 +740,7 @@ static void __init calgary_reserve_regions(struct pci_dev *dev) struct iommu_table *tbl = pci_iommu(dev->bus); /* reserve EMERGENCY_PAGES from bad_dma_address and up */ - iommu_range_reserve(tbl, DMA_ERROR_CODE, EMERGENCY_PAGES); + iommu_range_reserve(tbl, CALGARY_MAPPING_ERROR, EMERGENCY_PAGES); /* avoid the BIOS/VGA first 640KB-1MB region */ /* for CalIOC2 - avoid the entire first MB */ -- 2.11.0