linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Neuling <mikey@neuling.org>
To: mpe@ellerman.id.au, benh@kernel.crashing.org
Cc: imunsie@au.ibm.com, linuxppc-dev@ozlabs.org, mikey@neuling.org,
	Daniel Axtens <dja@axtens.net>,
	"Matthew R. Ochs" <mrochs@linux.vnet.ibm.com>,
	"Manoj N. Kumar" <manoj@linux.vnet.ibm.com>,
	brking@linux.vnet.ibm.com
Subject: [PATCH v3 13/24] cxl: Add cookie parameter to afu_release_irqs()
Date: Wed, 27 May 2015 16:07:07 +1000	[thread overview]
Message-ID: <1432706838-20794-14-git-send-email-mikey@neuling.org> (raw)
In-Reply-To: <1432706838-20794-1-git-send-email-mikey@neuling.org>

Add cookie parameter to afu_release_irqs() so that we can pass in a different
cookie than the context structure.  This will be useful for other kernel
drivers that want to call this but get their own cookie back in the interrupt
handler.

Update all existing call sites.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
---
 drivers/misc/cxl/context.c | 2 +-
 drivers/misc/cxl/cxl.h     | 2 +-
 drivers/misc/cxl/file.c    | 2 +-
 drivers/misc/cxl/irq.c     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
index 78ce990..36bb8e4 100644
--- a/drivers/misc/cxl/context.c
+++ b/drivers/misc/cxl/context.c
@@ -186,7 +186,7 @@ static void __detach_context(struct cxl_context *ctx)
 		return;
 
 	WARN_ON(cxl_detach_process(ctx));
-	afu_release_irqs(ctx);
+	afu_release_irqs(ctx, ctx);
 	flush_work(&ctx->fault_work); /* Only needed for dedicated process */
 	wake_up_all(&ctx->wq);
 }
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index f0b6727..7c014b8 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -609,7 +609,7 @@ void cxl_release_psl_err_irq(struct cxl *adapter);
 int cxl_register_serr_irq(struct cxl_afu *afu);
 void cxl_release_serr_irq(struct cxl_afu *afu);
 int afu_register_irqs(struct cxl_context *ctx, u32 count);
-void afu_release_irqs(struct cxl_context *ctx);
+void afu_release_irqs(struct cxl_context *ctx, void *cookie);
 irqreturn_t cxl_slice_irq_err(int irq, void *data);
 
 int cxl_debugfs_init(void);
diff --git a/drivers/misc/cxl/file.c b/drivers/misc/cxl/file.c
index 2364bca..5377c8b 100644
--- a/drivers/misc/cxl/file.c
+++ b/drivers/misc/cxl/file.c
@@ -191,7 +191,7 @@ static long afu_ioctl_start_work(struct cxl_context *ctx,
 
 	if ((rc = cxl_attach_process(ctx, false, work.work_element_descriptor,
 				     amr))) {
-		afu_release_irqs(ctx);
+		afu_release_irqs(ctx, ctx);
 		goto out;
 	}
 
diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c
index c8929c5..c740c7b 100644
--- a/drivers/misc/cxl/irq.c
+++ b/drivers/misc/cxl/irq.c
@@ -477,7 +477,7 @@ out:
 	return -ENOMEM;
 }
 
-void afu_release_irqs(struct cxl_context *ctx)
+void afu_release_irqs(struct cxl_context *ctx, void *cookie)
 {
 	irq_hw_number_t hwirq;
 	unsigned int virq;
@@ -488,7 +488,7 @@ void afu_release_irqs(struct cxl_context *ctx)
 		for (i = 0; i < ctx->irqs.range[r]; hwirq++, i++) {
 			virq = irq_find_mapping(NULL, hwirq);
 			if (virq)
-				cxl_unmap_irq(virq, ctx);
+				cxl_unmap_irq(virq, cookie);
 		}
 	}
 
-- 
2.1.0

  parent reply	other threads:[~2015-05-27  6:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-27  6:06 [PATCH v3 00/24] cxl: Add AFU virtual PHB and in kernel API Michael Neuling
2015-05-27  6:06 ` [PATCH v3 01/24] powerpc/copro: Fix faulting kernel segments Michael Neuling
2015-05-27  6:06 ` [PATCH v3 02/24] powerpc/pci: Export symbols for CXL Michael Neuling
2015-05-27  6:06 ` [PATCH v3 03/24] powerpc/pci: Add release_device() hook to phb ops Michael Neuling
2015-05-27  6:06 ` [PATCH v3 04/24] powerpc: Add cxl context to device archdata Michael Neuling
2015-05-27  6:06 ` [PATCH v3 05/24] powerpc/pci: Add shutdown hook to pci_controller_ops Michael Neuling
2015-05-27  6:07 ` [PATCH v3 06/24] powerpc/pci: Add pcibios_disable_device() hook Michael Neuling
2015-05-27  6:07 ` [PATCH v3 07/24] cxl: Document external user of existing API Michael Neuling
2015-05-27  6:07 ` [PATCH v3 08/24] cxl: Add shutdown hook Michael Neuling
2015-05-27  6:07 ` [PATCH v3 09/24] cxl: Remove unnecessarily verbose print in cxl_remove() Michael Neuling
2015-05-27  6:07 ` [PATCH v3 10/24] cxl: Re-order card init to check the VSEC earlier Michael Neuling
2015-05-27  6:07 ` [PATCH v3 11/24] cxl: Fix error path on probe Michael Neuling
2015-05-27  6:07 ` [PATCH v3 12/24] cxl: Dump debug info on the AFU configuration record Michael Neuling
2015-05-27  6:07 ` Michael Neuling [this message]
2015-05-27  6:07 ` [PATCH v3 14/24] cxl: Rework detach context functions Michael Neuling
2015-05-27  6:07 ` [PATCH v3 15/24] cxl: cxl_afu_reset() -> __cxl_afu_reset() Michael Neuling
2015-05-27  6:07 ` [PATCH v3 16/24] cxl: Export some symbols Michael Neuling
2015-05-27  6:07 ` [PATCH v3 17/24] cxl: Only check pid for userspace contexts Michael Neuling
2015-05-27  6:07 ` [PATCH v3 18/24] cxl: Split afu_register_irqs() function Michael Neuling
2015-05-27  6:07 ` [PATCH v3 19/24] cxl: Configure PSL for kernel contexts and merge code Michael Neuling
2015-05-27  6:07 ` [PATCH v3 20/24] cxl: Rework context lifetimes Michael Neuling
2015-05-27  6:07 ` [PATCH v3 21/24] cxl: Cleanup Makefile Michael Neuling
2015-05-27  6:07 ` [PATCH v3 22/24] cxl: Move include file cxl.h -> cxl-base.h Michael Neuling
2015-05-27  6:07 ` [PATCH v3 23/24] cxl: Export file ops for use by API Michael Neuling
2015-05-27  6:07 ` [PATCH v3 24/24] cxl: Add AFU virtual PHB and kernel API Michael Neuling

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=1432706838-20794-14-git-send-email-mikey@neuling.org \
    --to=mikey@neuling.org \
    --cc=benh@kernel.crashing.org \
    --cc=brking@linux.vnet.ibm.com \
    --cc=dja@axtens.net \
    --cc=imunsie@au.ibm.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=manoj@linux.vnet.ibm.com \
    --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).