From: Dan Carpenter <dan.carpenter@oracle.com>
To: kernel-janitors@vger.kernel.org
Subject: [patch] sparc64: enable IRQs on error paths
Date: Fri, 25 Nov 2016 11:12:51 +0000 [thread overview]
Message-ID: <20161125111054.GE5938@mwanda> (raw)
There are several error paths where we should enable 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>
---
Not tested.
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
index 06981cc7..274df7a 100644
--- a/arch/sparc/kernel/pci_sun4v.c
+++ b/arch/sparc/kernel/pci_sun4v.c
@@ -230,12 +230,16 @@ static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
for (n = 0; n < npages; n++) {
long err = iommu_batch_add(first_page + (n * PAGE_SIZE), mask);
- if (unlikely(err < 0L))
+ if (unlikely(err < 0L)) {
+ local_irq_restore(flags);
goto iommu_map_fail;
+ }
}
- if (unlikely(iommu_batch_end(mask) < 0L))
+ if (unlikely(iommu_batch_end(mask) < 0L)) {
+ local_irq_restore(flags);
goto iommu_map_fail;
+ }
local_irq_restore(flags);
@@ -398,11 +402,15 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,
for (i = 0; i < npages; i++, base_paddr += IO_PAGE_SIZE) {
long err = iommu_batch_add(base_paddr, mask);
- if (unlikely(err < 0L))
+ if (unlikely(err < 0L)) {
+ local_irq_restore(flags);
goto iommu_map_fail;
+ }
}
- if (unlikely(iommu_batch_end(mask) < 0L))
+ if (unlikely(iommu_batch_end(mask) < 0L)) {
+ local_irq_restore(flags);
goto iommu_map_fail;
+ }
local_irq_restore(flags);
next reply other threads:[~2016-11-25 11:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-25 11:12 Dan Carpenter [this message]
2016-11-25 12:32 ` [patch] sparc64: enable IRQs on error paths Sowmini Varadhan
2016-11-25 13:01 ` Dan Carpenter
2016-11-25 13:11 ` Sowmini Varadhan
2016-11-25 13:46 ` Dan Carpenter
2016-11-25 13:57 ` Sowmini Varadhan
2016-11-25 20:45 ` Sam Ravnborg
2016-11-25 21:06 ` tndave
2016-11-25 21:11 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161125111054.GE5938@mwanda \
--to=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.