[v2,16/21] parisc: return error code from .map_sg() ops

Message ID	20210723175008.22410-17-logang@deltatee.com
State	New
Headers	show Return-Path: <sparclinux-owner@vger.kernel.org> From: Logan Gunthorpe <logang@deltatee.com> To: linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, iommu@lists.linux-foundation.org, linux-parisc@vger.kernel.org, xen-devel@lists.xenproject.org Cc: Christoph Hellwig <hch@lst.de>, Marek Szyprowski <m.szyprowski@samsung.com>, Robin Murphy <robin.murphy@arm.com>, Stephen Bates <sbates@raithlin.com>, Martin Oliveira <martin.oliveira@eideticom.com>, Logan Gunthorpe <logang@deltatee.com>, "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>, Helge Deller <deller@gmx.de> Date: Fri, 23 Jul 2021 11:50:03 -0600 Message-Id: <20210723175008.22410-17-logang@deltatee.com> In-Reply-To: <20210723175008.22410-1-logang@deltatee.com> References: <20210723175008.22410-1-logang@deltatee.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [PATCH v2 16/21] parisc: return error code from .map_sg() ops Precedence: bulk
Series	.map_sg() error cleanup \| expand [v2,00/21] .map_sg() error cleanup [v2,01/21] dma-mapping: Allow map_sg() ops to return negative error codes [v2,02/21] dma-direct: Return appropriate error code from dma_direct_map_sg() [v2,03/21] iommu: Return full error code from iommu_map_sg[_atomic]() [v2,04/21] dma-iommu: Return error code from iommu_dma_map_sg() [v2,05/21] alpha: return error code from alpha_pci_map_sg() [v2,06/21] ARM/dma-mapping: return error code from .map_sg() ops [v2,07/21] ARM/dma-mapping: don't set failed sg dma_address to DMA_MAPPING_ERROR [v2,08/21] ia64/sba_iommu: return error code from sba_map_sg_attrs() [v2,09/21] MIPS/jazzdma: return error code from jazz_dma_map_sg() [v2,10/21] powerpc/iommu: return error code from .map_sg() ops [v2,11/21] powerpc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR [v2,12/21] s390/pci: return error code from s390_dma_map_sg() [v2,13/21] s390/pci: don't set failed sg dma_address to DMA_MAPPING_ERROR [v2,14/21] sparc/iommu: return error codes from .map_sg() ops [v2,15/21] sparc/iommu: don't set failed sg dma_address to DMA_MAPPING_ERROR [v2,16/21] parisc: return error code from .map_sg() ops [v2,17/21] xen: swiotlb: return error code from xen_swiotlb_map_sg() [v2,18/21] x86/amd_gart: return error code from gart_map_sg() [v2,19/21] x86/amd_gart: don't set failed sg dma_address to DMA_MAPPING_ERROR [v2,20/21] dma-mapping: return error code from dma_dummy_map_sg() [v2,21/21] dma-mapping: Disallow .map_sg operations from returning zero on error

Message ID

20210723175008.22410-17-logang@deltatee.com

State

New

Headers

From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org,
        linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        linux-s390@vger.kernel.org, sparclinux@vger.kernel.org,
        iommu@lists.linux-foundation.org, linux-parisc@vger.kernel.org,
        xen-devel@lists.xenproject.org
Cc: Christoph Hellwig <hch@lst.de>,
        Marek Szyprowski <m.szyprowski@samsung.com>,
        Robin Murphy <robin.murphy@arm.com>,
        Stephen Bates <sbates@raithlin.com>,
        Martin Oliveira <martin.oliveira@eideticom.com>,
        Logan Gunthorpe <logang@deltatee.com>,
        "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
        Helge Deller <deller@gmx.de>
Date: Fri, 23 Jul 2021 11:50:03 -0600
Message-Id: <20210723175008.22410-17-logang@deltatee.com>
In-Reply-To: <20210723175008.22410-1-logang@deltatee.com>
References: <20210723175008.22410-1-logang@deltatee.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [PATCH v2 16/21] parisc: return error code from .map_sg() ops
Precedence: bulk

Series

.map_sg() error cleanup | expand

Commit Message

Logan Gunthorpe July 23, 2021, 5:50 p.m. UTC

From: Martin Oliveira <martin.oliveira@eideticom.com>

The .map_sg() op now expects an error code instead of zero on failure.
Return -EINVAL if the ioc cannot be obtained.

Signed-off-by: Martin Oliveira <martin.oliveira@eideticom.com>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
---
 drivers/parisc/ccio-dma.c  | 2 +-
 drivers/parisc/sba_iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index b5f9ee81a46c..452e72b7bd01 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -918,7 +918,7 @@  ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 	BUG_ON(!dev);
 	ioc = GET_IOC(dev);
 	if (!ioc)
-		return 0;
+		return -EINVAL;
 	
 	DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
 
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index dce4cdf786cd..e60690d38d67 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -947,7 +947,7 @@  sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
 	ioc = GET_IOC(dev);
 	if (!ioc)
-		return 0;
+		return -EINVAL;
 
 	/* Fast path single entry scatterlists. */
 	if (nents == 1) {

[v2,16/21] parisc: return error code from .map_sg() ops

Commit Message

Patch