* [patch] sparc64: restore irq in error paths in iommu
@ 2016-11-25 21:15 Dan Carpenter
0 siblings, 0 replies; 2+ messages in thread
From: Dan Carpenter @ 2016-11-25 21:15 UTC (permalink / raw)
To: kernel-janitors
There are some error paths where we should restore IRQs but we don't.
Fixes: bb620c3d3925 ("sparc: Make sparc64 use scalable lib/iommu-common.c functions")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 06981cc7..7d23cad 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -242,6 +242,7 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
return ret;
iommu_map_fail:
+ local_irq_restore(flags);
iommu_tbl_range_free(tbl, *dma_addrp, npages, IOMMU_ERROR_CODE);
range_alloc_fail:
@@ -414,6 +415,7 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
return DMA_ERROR_CODE;
iommu_map_fail:
+ local_irq_restore(flags);
iommu_tbl_range_free(tbl, bus_addr, npages, IOMMU_ERROR_CODE);
return DMA_ERROR_CODE;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] sparc64: restore irq in error paths in iommu
@ 2016-12-12 2:19 David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-12-12 2:19 UTC (permalink / raw)
To: kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 26 Nov 2016 00:15:37 +0300
> There are some error paths where we should restore IRQs but we don't.
>
> Fixes: bb620c3d3925 ("sparc: Make sparc64 use scalable lib/iommu-common.c functions")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-12 2:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-25 21:15 [patch] sparc64: restore irq in error paths in iommu Dan Carpenter
-- strict thread matches above, loose matches on Subject: below --
2016-12-12 2:19 David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).