[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2 08/21] ia64/sba_iommu: return error code from sba_map_sg_attrs()

From: Martin Oliveira <martin.oliveira@xxxxxxxxxxxxx>

The .map_sg() op now expects an error code instead of zero on failure.

In the case of a dma_mapping_error() return -EIO as the actual cause
is opaque here.

sba_coalesce_chunks() may only presently fail if sba_alloc_range()
fails, which in turn only fails if the iommu is out of mapping
resources, hence a -ENOMEM is used in that case.

Signed-off-by: Martin Oliveira <martin.oliveira@xxxxxxxxxxxxx>
Signed-off-by: Logan Gunthorpe <logang@xxxxxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Niklas Schnelle <schnelle@xxxxxxxxxxxxx>
Cc: Thomas Bogendoerfer <tsbogend@xxxxxxxxxxxxxxxx>
 arch/ia64/hp/common/sba_iommu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 9148ddbf02e5..430c166b68cd 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1458,8 +1458,8 @@ static int sba_map_sg_attrs(struct device *dev, struct 
scatterlist *sglist,
                sglist->dma_length = sglist->length;
                sglist->dma_address = sba_map_page(dev, sg_page(sglist),
                                sglist->offset, sglist->length, dir, attrs);
-               if (dma_mapping_error(dev, sglist->dma_address))
-                       return 0;
+               if(dma_mapping_error(dev, sglist->dma_address))
+                       return -EIO;
                return 1;
@@ -1486,7 +1486,7 @@ static int sba_map_sg_attrs(struct device *dev, struct 
scatterlist *sglist,
        coalesced = sba_coalesce_chunks(ioc, dev, sglist, nents);
        if (coalesced < 0) {
                sba_unmap_sg_attrs(dev, sglist, nents, dir, attrs);
-               return 0;
+               return -ENOMEM;



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.