lkml.org 
[lkml]   [2015]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
    Commit-ID:  c7cfc94096db28d3072b402c224eb50349926e24
    Gitweb: http://git.kernel.org/tip/c7cfc94096db28d3072b402c224eb50349926e24
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Mon, 1 Jun 2015 16:05:10 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Tue, 16 Jun 2015 10:10:16 +0200

    genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain

    For irq associated with hierarchy irqdomains, there will be multiple
    irq_datas for one irq_desc. So enhance irq_data_to_desc() to support
    hierarchy irqdomain. Also export irq_data_to_desc() as an inline
    function for later reuse.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Randy Dunlap <rdunlap@infradead.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Marc Zyngier <marc.zyngier@arm.com>
    Link: http://lkml.kernel.org/r/1433145945-789-2-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/irqdesc.h | 9 +++++++++
    kernel/irq/internals.h | 2 --
    2 files changed, 9 insertions(+), 2 deletions(-)

    diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
    index dd1109f..a113a8d 100644
    --- a/include/linux/irqdesc.h
    +++ b/include/linux/irqdesc.h
    @@ -93,6 +93,15 @@ struct irq_desc {
    extern struct irq_desc irq_desc[NR_IRQS];
    #endif

    +static inline struct irq_desc *irq_data_to_desc(struct irq_data *data)
    +{
    +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
    + return irq_to_desc(data->irq);
    +#else
    + return container_of(data, struct irq_desc, irq_data);
    +#endif
    +}
    +
    static inline struct irq_data *irq_desc_get_irq_data(struct irq_desc *desc)
    {
    return &desc->irq_data;
    diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
    index df553b0..b93d434 100644
    --- a/kernel/irq/internals.h
    +++ b/kernel/irq/internals.h
    @@ -59,8 +59,6 @@ enum {
    #include "debug.h"
    #include "settings.h"

    -#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)
    -
    extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq,
    unsigned long flags);
    extern void __disable_irq(struct irq_desc *desc, unsigned int irq);

    \
     
     \ /
      Last update: 2015-06-16 10:41    [W:3.757 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site