lkml.org 
[lkml]   [2014]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/apic] x86, hpet: Use new irqdomain interfaces to allocate/free IRQ
    Commit-ID:  654eda5170093e5dc6fe63c044be390b933b172c
    Gitweb: http://git.kernel.org/tip/654eda5170093e5dc6fe63c044be390b933b172c
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Tue, 25 Nov 2014 13:53:12 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 26 Nov 2014 18:59:24 +0100

    x86, hpet: Use new irqdomain interfaces to allocate/free IRQ

    Use new irqdomain interfaces to allocate/free IRQ for HPET, so we could
    kill GENERIC_IRQ_LEGACY_ALLOC_HWIRQ later.

    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: Joerg Roedel <joro@8bytes.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
    Cc: Randy Dunlap <rdunlap@infradead.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Link: http://lkml.kernel.org/r/1416894816-23245-4-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/x86/kernel/hpet.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
    index 319bcb9..24db2d3 100644
    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -11,6 +11,7 @@
    #include <linux/cpu.h>
    #include <linux/pm.h>
    #include <linux/io.h>
    +#include <linux/irqdomain.h>

    #include <asm/fixmap.h>
    #include <asm/hpet.h>
    @@ -476,7 +477,7 @@ static int hpet_msi_next_event(unsigned long delta,
    static int hpet_setup_msi_irq(unsigned int irq)
    {
    if (x86_msi.setup_hpet_msi(irq, hpet_blockid)) {
    - irq_free_hwirq(irq);
    + irq_domain_free_irqs(irq, 1);
    return -EINVAL;
    }
    return 0;
    @@ -484,9 +485,10 @@ static int hpet_setup_msi_irq(unsigned int irq)

    static int hpet_assign_irq(struct hpet_dev *dev)
    {
    - unsigned int irq = irq_alloc_hwirq(-1);
    + int irq;

    - if (!irq)
    + irq = irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, NULL);
    + if (irq <= 0)
    return -EINVAL;

    irq_set_handler_data(irq, dev);

    \
     
     \ /
      Last update: 2014-11-27 00:41    [W:5.532 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site