From: Daniel Axtens <dja@axtens.net>
To: linuxppc-dev@ozlabs.org
Cc: mpe@ellerman.id.au, benh@kernel.crashing.org, mikey@neuling.org,
imunsie@au.ibm.com, "Matthew R. Ochs" <mrochs@linux.vnet.ibm.com>,
Daniel Axtens <dja@axtens.net>
Subject: [PATCH 4/8] cxl: Make IRQ release idempotent
Date: Tue, 14 Jul 2015 12:29:30 +1000 [thread overview]
Message-ID: <1436840974-3412-5-git-send-email-dja@axtens.net> (raw)
In-Reply-To: <1436840974-3412-1-git-send-email-dja@axtens.net>
Check if an IRQ is mapped before releasing it.
This will simplify future EEH code by allowing unconditional unmapping
of IRQs.
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
drivers/misc/cxl/irq.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c
index 680cd263436d..121ec48f3ab4 100644
--- a/drivers/misc/cxl/irq.c
+++ b/drivers/misc/cxl/irq.c
@@ -341,6 +341,9 @@ int cxl_register_psl_err_irq(struct cxl *adapter)
void cxl_release_psl_err_irq(struct cxl *adapter)
{
+ if (adapter->err_virq != irq_find_mapping(NULL, adapter->err_hwirq))
+ return;
+
cxl_p1_write(adapter, CXL_PSL_ErrIVTE, 0x0000000000000000);
cxl_unmap_irq(adapter->err_virq, adapter);
cxl_release_one_irq(adapter, adapter->err_hwirq);
@@ -374,6 +377,9 @@ int cxl_register_serr_irq(struct cxl_afu *afu)
void cxl_release_serr_irq(struct cxl_afu *afu)
{
+ if (afu->serr_virq != irq_find_mapping(NULL, afu->serr_hwirq))
+ return;
+
cxl_p1n_write(afu, CXL_PSL_SERR_An, 0x0000000000000000);
cxl_unmap_irq(afu->serr_virq, afu);
cxl_release_one_irq(afu->adapter, afu->serr_hwirq);
@@ -400,6 +406,9 @@ int cxl_register_psl_irq(struct cxl_afu *afu)
void cxl_release_psl_irq(struct cxl_afu *afu)
{
+ if (afu->psl_virq != irq_find_mapping(NULL, afu->psl_hwirq))
+ return;
+
cxl_unmap_irq(afu->psl_virq, afu);
cxl_release_one_irq(afu->adapter, afu->psl_hwirq);
kfree(afu->psl_irq_name);
--
2.1.4
next prev parent reply other threads:[~2015-07-14 2:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 2:29 [PATCH 0/8] CXL EEH Handling Daniel Axtens
2015-07-14 2:29 ` [PATCH 1/8] cxl: Allow the kernel to trust that an image won't change on PERST Daniel Axtens
2015-07-14 2:29 ` [PATCH 2/8] cxl: Drop commands if the PCI channel is not in normal state Daniel Axtens
2015-07-14 2:29 ` [PATCH 3/8] cxl: Allocate and release the SPA with the AFU Daniel Axtens
2015-07-14 2:29 ` Daniel Axtens [this message]
2015-07-14 2:29 ` [PATCH 5/8] cxl: Clean up adapter MMIO unmap path Daniel Axtens
2015-07-14 2:29 ` [PATCH 6/8] cxl: Refactor adaptor init/teardown Daniel Axtens
2015-07-14 2:29 ` [PATCH 7/8] cxl: Refactor AFU init/teardown Daniel Axtens
2015-07-14 2:29 ` [PATCH 8/8] cxl: EEH support Daniel Axtens
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=1436840974-3412-5-git-send-email-dja@axtens.net \
--to=dja@axtens.net \
--cc=benh@kernel.crashing.org \
--cc=imunsie@au.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=mrochs@linux.vnet.ibm.com \
/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 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).