diff options
| author |   Martin Oliveira <martin.oliveira@eideticom.com> | 2021-07-29 14:15:23 -0600 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2021-08-09 17:13:05 +0200 |
| commit | ca33d26ac640bdf74e5fd0fcd711dbc5ab9f36c0 (patch) | |
| tree | 3318cf418a51e69b765b9581a9dfd83641c67417 /arch/alpha/kernel/pci_iommu.c | |
| parent | iommu/dma: return error code from iommu_dma_map_sg() (diff) | |
| download | linux-dev-ca33d26ac640bdf74e5fd0fcd711dbc5ab9f36c0.tar.xz linux-dev-ca33d26ac640bdf74e5fd0fcd711dbc5ab9f36c0.zip | |
alpha: return error code from alpha_pci_map_sg()
The .map_sg() op now expects an error code instead of zero on failure.
pci_map_single_1() can fail for different reasons, but since the only
supported type of error return is DMA_MAPPING_ERROR, we coalesce those
errors into EIO.
ENOMEM is returned when no page tables can be allocated.
Signed-off-by: Martin Oliveira <martin.oliveira@eideticom.com>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to '')
| -rw-r--r-- | arch/alpha/kernel/pci_iommu.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 35d7b3096d6e..21f9ac101324 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -649,7 +649,9 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, sg->dma_address = pci_map_single_1(pdev, SG_ENT_VIRT_ADDRESS(sg), sg->length, dac_allowed); - return sg->dma_address != DMA_MAPPING_ERROR; + if (sg->dma_address == DMA_MAPPING_ERROR) + return -EIO; + return 1; } start = sg; @@ -685,8 +687,10 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, if (out < end) out->dma_length = 0; - if (out - start == 0) + if (out - start == 0) { printk(KERN_WARNING "pci_map_sg failed: no entries?\n"); + return -ENOMEM; + } DBGA("pci_map_sg: %ld entries\n", out - start); return out - start; @@ -699,7 +703,7 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, entries. Unmap them now. */ if (out > start) pci_unmap_sg(pdev, start, out - start, dir); - return 0; + return -ENOMEM; } /* Unmap a set of streaming mode DMA translations. Again, cpu read |