From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>,
Eric Biederman <ebiederm@xmission.com>,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 05/12] genericirq: make irq_chip to have member with irq_desc pointer
Date: Thu, 04 Mar 2010 02:08:52 -0800 [thread overview]
Message-ID: <1267697339-5491-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1267697339-5491-1-git-send-email-yinghai@kernel.org>
will have
void (*desc_ack)(struct irq_desc *desc);
void (*desc_mask)(struct irq_desc *desc);
void (*desc_mask_ack)(struct irq_desc *desc);
void (*desc_unmask)(struct irq_desc *desc);
void (*desc_eoi)(struct irq_desc *desc);
so for sparseirq with raidix tree, we don't call extra irq_to_desc, and could use desc directly
-v2: change all member of irq_chip to use desc only.
-v3: update after legacy_pic
according to Thomas, use other copy for new member with *desc, so could
make the transition more smooth
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/linux/irq.h | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 129 insertions(+), 0 deletions(-)
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 707ab12..b686d1e 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -110,6 +110,7 @@ struct msi_desc;
*/
struct irq_chip {
const char *name;
+
unsigned int (*startup)(unsigned int irq);
void (*shutdown)(unsigned int irq);
void (*enable)(unsigned int irq);
@@ -135,6 +136,34 @@ struct irq_chip {
#ifdef CONFIG_IRQ_RELEASE_METHOD
void (*release)(unsigned int irq, void *dev_id);
#endif
+
+ unsigned int (*desc_startup)(struct irq_desc *desc);
+ void (*desc_shutdown)(struct irq_desc *desc);
+ void (*desc_enable)(struct irq_desc *desc);
+ void (*desc_disable)(struct irq_desc *desc);
+
+ void (*desc_ack)(struct irq_desc *desc);
+ void (*desc_mask)(struct irq_desc *desc);
+ void (*desc_mask_ack)(struct irq_desc *desc);
+ void (*desc_unmask)(struct irq_desc *desc);
+ void (*desc_eoi)(struct irq_desc *desc);
+
+ void (*desc_end)(struct irq_desc *desc);
+ int (*desc_set_affinity)(struct irq_desc *desc,
+ const struct cpumask *dest);
+ int (*desc_retrigger)(struct irq_desc *desc);
+
+ int (*desc_set_type)(struct irq_desc *desc, unsigned int flow_type);
+ int (*desc_set_wake)(struct irq_desc *desc, unsigned int on);
+
+ void (*desc_bus_lock)(struct irq_desc *desc);
+ void (*desc_bus_sync_unlock)(struct irq_desc *desc);
+
+ /* Currently used only by UML, might disappear one day.*/
+#ifdef CONFIG_IRQ_RELEASE_METHOD
+ void (*desc_release)(struct irq_desc *desc, void *dev_id);
+#endif
+
/*
* For compatibility, ->typename is copied into ->name.
* Will disappear.
@@ -227,6 +256,106 @@ static inline struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)
extern struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node);
+static inline unsigned int
+desc_chip_startup(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_startup)
+ return chip->desc_startup(desc);
+ else if (chip->startup)
+ return chip->startup(irq);
+ return 0;
+}
+static inline void
+desc_chip_shutdown(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_shutdown)
+ chip->desc_shutdown(desc);
+ else if (chip->shutdown)
+ chip->shutdown(irq);
+}
+static inline void
+desc_chip_enable(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_enable)
+ chip->desc_enable(desc);
+ else if (chip->enable)
+ chip->enable(irq);
+}
+static inline void
+desc_chip_disable(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_disable)
+ chip->desc_disable(desc);
+ else if (chip->disable)
+ chip->disable(irq);
+}
+static inline void
+desc_chip_ack(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_ack)
+ chip->desc_ack(desc);
+ else if (chip->ack)
+ chip->ack(irq);
+}
+static inline void
+desc_chip_mask(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_mask)
+ chip->desc_mask(desc);
+ else if (chip->mask)
+ chip->mask(irq);
+}
+static inline void
+desc_chip_mask_ack(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_mask_ack)
+ chip->desc_mask_ack(desc);
+ else if (chip->mask_ack)
+ chip->mask_ack(irq);
+}
+static inline void
+desc_chip_unmask(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_unmask)
+ chip->desc_unmask(desc);
+ else if (chip->unmask)
+ chip->unmask(irq);
+}
+static inline void
+desc_chip_eoi(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_eoi)
+ chip->desc_eoi(desc);
+ else if (chip->eoi)
+ chip->eoi(irq);
+}
+static inline void
+desc_chip_end(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_end)
+ chip->desc_end(desc);
+ else if (chip->end)
+ chip->end(irq);
+}
+static inline int
+desc_chip_set_affinity(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc, const struct cpumask *dest)
+{
+ if (chip->desc_set_affinity)
+ return chip->desc_set_affinity(desc, dest);
+ else if (chip->set_affinity)
+ return chip->set_affinity(irq, dest);
+ return 0;
+}
+static inline int
+desc_chip_retrigger(struct irq_chip *chip, unsigned int irq, struct irq_desc *desc)
+{
+ if (chip->desc_retrigger)
+ return chip->desc_retrigger(desc);
+ else if (chip->startup)
+ return chip->retrigger(irq);
+ return 0;
+}
+
/*
* Pick up the arch-dependent methods:
*/
--
1.6.4.2
next prev parent reply other threads:[~2010-03-04 10:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-04 10:08 [PATCH 0/12] irq related: make function to take irq_desc pointer instead of irq Yinghai Lu
2010-03-04 10:08 ` [PATCH 01/12] x86: fix out of order of gsi - full Yinghai Lu
2010-03-04 10:08 ` [PATCH 02/12] x86: set nr_irqs_gsi only in probe_nr_irqs_gsi Yinghai Lu
2010-03-04 10:08 ` [PATCH 03/12] x86: kill smpboot_hooks.h Yinghai Lu
2010-03-04 10:08 ` [PATCH 04/12] x86: use vector_desc instead of vector_irq Yinghai Lu
2010-03-04 10:08 ` Yinghai Lu [this message]
2010-03-04 10:08 ` [PATCH 06/12] genericirq: make irq_chip related function to take desc Yinghai Lu
2010-03-04 14:31 ` Thomas Gleixner
2010-03-04 18:56 ` Yinghai Lu
2010-03-04 19:08 ` Thomas Gleixner
2010-03-04 19:20 ` Yinghai Lu
2010-03-05 7:47 ` Julia Lawall
2010-03-21 4:18 ` Eric W. Biederman
2010-03-21 11:03 ` Julia Lawall
2010-03-21 13:11 ` [PATCH] irq: Start the transition of irq_chip methods taking a desc Eric W. Biederman
2010-03-21 13:11 ` Eric W. Biederman
2010-03-21 14:43 ` Thomas Gleixner
2010-03-21 18:50 ` Yinghai Lu
2010-03-22 0:32 ` Eric W. Biederman
2010-03-21 13:49 ` [PATCH 06/12] genericirq: make irq_chip related function to take desc Eric W. Biederman
2010-03-21 14:19 ` Julia Lawall
2010-03-21 16:29 ` Julia Lawall
2010-03-21 11:08 ` Julia Lawall
2010-03-21 11:43 ` Eric W. Biederman
2010-03-21 19:16 ` Julia Lawall
2010-03-21 19:35 ` Julia Lawall
2010-03-21 19:36 ` Julia Lawall
2010-03-22 0:36 ` Eric W. Biederman
2010-03-04 19:18 ` Yinghai Lu
2010-03-04 10:08 ` [PATCH 07/12] genericirq: make hpet_msi/ht/msi/dmar_msi " Yinghai Lu
2010-03-04 10:08 ` [PATCH 08/12] x86: make irq_chip to use desc_mask instead of mask Yinghai Lu
2010-03-04 15:10 ` [PATCH 08/12] x86: make irq_chip to use desc_mask instead of maskn Thomas Gleixner
2010-03-04 10:08 ` [PATCH 09/12] x86: irq_chip to use desc_mask instead of mask part 2 Yinghai Lu
2010-03-04 10:08 ` [PATCH 10/12] genericirq: add set_irq_desc_chip/data Yinghai Lu
2010-03-04 10:08 ` [PATCH 11/12] x86/iommu/dmar: update iommu/inter_remapping to use desc Yinghai Lu
2010-03-04 10:08 ` [PATCH 12/12] x86: remove arch_probe_nr_irqs Yinghai Lu
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=1267697339-5491-6-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
/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.