diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2016-11-02 07:12:47 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad@kernel.org> | 2016-11-07 15:06:32 -0500 |
| commit | 7641842164c34b672ef3e70e881e8a72735305c1 (patch) | |
| tree | 3cc9ce655ba49870ff070225b231f1d2074566b3 /arch/arm | |
| parent | ebcf6f979d55f35dfe36956364f0dce8c738220b (diff) | |
| download | talos-obmc-linux-7641842164c34b672ef3e70e881e8a72735305c1.tar.gz talos-obmc-linux-7641842164c34b672ef3e70e881e8a72735305c1.zip | |
swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function
The mapping function should always return DMA_ERROR_CODE when a mapping has
failed as this is what the DMA API expects when a DMA error has occurred.
The current function for mapping a page in Xen was returning either
DMA_ERROR_CODE or 0 depending on where it failed.
On x86 DMA_ERROR_CODE is 0, but on other architectures such as ARM it is
~0. We need to make sure we return the same error value if either the
mapping failed or the device is not capable of accessing the mapping.
If we are returning DMA_ERROR_CODE as our error value we can drop the
function for checking the error code as the default is to compare the
return value against DMA_ERROR_CODE if no function is defined.
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/xen/mm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index d062f08f5020..bd62d94f8ac5 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -186,7 +186,6 @@ struct dma_map_ops *xen_dma_ops; EXPORT_SYMBOL(xen_dma_ops); static struct dma_map_ops xen_swiotlb_dma_ops = { - .mapping_error = xen_swiotlb_dma_mapping_error, .alloc = xen_swiotlb_alloc_coherent, .free = xen_swiotlb_free_coherent, .sync_single_for_cpu = xen_swiotlb_sync_single_for_cpu, |
