powerpc/xive: add the HW IRQ number under xive_irq_data

It will be required later by the H_INT_ESB hcall.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/xive.h b/arch/powerpc/include/asm/xive.h
index 473f133a8555fe8e918e78f7424bdea2b6d21deb..64ec9bbcf03edb1213e866d0f7ccdcf197101f1a 100644 (file)
--- a/arch/powerpc/include/asm/xive.h
+++ b/arch/powerpc/include/asm/xive.h
@@ -45,6 +45,7 @@ struct xive_irq_data {
        void __iomem *trig_mmio;
        u32 esb_shift;
        int src_chip;
+       u32 hw_irq;
 
        /* Setup/used by frontend */
        int target;

diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
index ace3d7aedfb725640e7ee86127e195d1a6997b08..44f3a25ca630a61df697639155fce0214c09a8d3 100644 (file)
--- a/arch/powerpc/sysdev/xive/native.c
+++ b/arch/powerpc/sysdev/xive/native.c
@@ -82,6 +82,8 @@ int xive_native_populate_irq_data(u32 hw_irq, struct xive_irq_data *data)
                return -ENOMEM;
        }
 
+       data->hw_irq = hw_irq;
+
        if (!data->trig_page)
                return 0;
        if (data->trig_page == data->eoi_page) {

diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
index 797bb0636ab71682c2c1a5d4b62eb36f0e0cb695..0fcae7504353a6c53160329b402557e1b3f74726 100644 (file)
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -264,6 +264,8 @@ static int xive_spapr_populate_irq_data(u32 hw_irq, struct xive_irq_data *data)
                return -ENOMEM;
        }
 
+       data->hw_irq = hw_irq;
+
        /* Full function page supports trigger */
        if (flags & XIVE_SRC_TRIGGER) {
                data->trig_mmio = data->eoi_mmio;