lkml.org 
[lkml]   [2015]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:irq/urgent] powerpc, irq: Use access helper irq_data_get_affinity_mask()
    Commit-ID:  da92b4eb7e2ec9866f14a0c8f453788e8052dee7
    Gitweb: http://git.kernel.org/tip/da92b4eb7e2ec9866f14a0c8f453788e8052dee7
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Mon, 1 Jun 2015 16:05:33 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Tue, 15 Sep 2015 17:06:28 +0200

    powerpc, irq: Use access helper irq_data_get_affinity_mask()

    Use access helper irq_data_get_affinity_mask() so we can move the
    affinity mask to irq_common_data.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: linuxppc-dev@lists.ozlabs.org
    Link: http://lkml.kernel.org/r/1433145945-789-25-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/powerpc/kernel/irq.c | 2 +-
    arch/powerpc/sysdev/xics/ics-opal.c | 2 +-
    arch/powerpc/sysdev/xics/ics-rtas.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
    index 4509603..290559d 100644
    --- a/arch/powerpc/kernel/irq.c
    +++ b/arch/powerpc/kernel/irq.c
    @@ -441,7 +441,7 @@ void migrate_irqs(void)

    chip = irq_data_get_irq_chip(data);

    - cpumask_and(mask, data->affinity, map);
    + cpumask_and(mask, irq_data_get_affinity_mask(data), map);
    if (cpumask_any(mask) >= nr_cpu_ids) {
    pr_warn("Breaking affinity for irq %i\n", irq);
    cpumask_copy(mask, map);
    diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c
    index 11ac964..27c936c 100644
    --- a/arch/powerpc/sysdev/xics/ics-opal.c
    +++ b/arch/powerpc/sysdev/xics/ics-opal.c
    @@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)
    if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
    return;

    - server = xics_get_irq_server(d->irq, d->affinity, 0);
    + server = xics_get_irq_server(d->irq, irq_data_get_affinity_mask(d), 0);
    server = ics_opal_mangle_server(server);

    rc = opal_set_xive(hw_irq, server, DEFAULT_PRIORITY);
    diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
    index d1c625c..3854dd4 100644
    --- a/arch/powerpc/sysdev/xics/ics-rtas.c
    +++ b/arch/powerpc/sysdev/xics/ics-rtas.c
    @@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)
    if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
    return;

    - server = xics_get_irq_server(d->irq, d->affinity, 0);
    + server = xics_get_irq_server(d->irq, irq_data_get_affinity_mask(d), 0);

    call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hw_irq, server,
    DEFAULT_PRIORITY);

    \
     
     \ /
      Last update: 2015-09-15 18:01    [W:3.461 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site