powerpc/xive: Use the "ibm, chip-id" property only under PowerNV

[ Upstream commit e9e16917bc388846163b8566a298a291d71e44c9 ]

The 'chip_id' field of the XIVE CPU structure is used to choose a
target for a source located on the same chip. For that, the XIVE
driver queries the chip identifier from the "ibm,chip-id" property
and compares it to a 'src_chip' field identifying the chip of a
source. This information is only available on the PowerNV platform,
'src_chip' being assigned to XIVE_INVALID_CHIP_ID under pSeries.

The "ibm,chip-id" property is also not available on all platforms. It
was first introduced on PowerNV and later, under QEMU for pSeries/KVM.
However, the property is not part of PAPR and does not exist under
pSeries/PowerVM.

Assign 'chip_id' to XIVE_INVALID_CHIP_ID by default and let the
PowerNV platform override the value with the "ibm,chip-id" property.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210413130352.1183267-1-clg@kaod.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c
index 5cacb632eb37a8e4b143037a3fc4cb88567c994b..31b657c377353832c3b6d8c5f08fb28aae111ff3 100644 (file)
--- a/arch/powerpc/sysdev/xive/common.c
+++ b/arch/powerpc/sysdev/xive/common.c
@@ -1341,17 +1341,14 @@ static int xive_prepare_cpu(unsigned int cpu)
 
        xc = per_cpu(xive_cpu, cpu);
        if (!xc) {
-               struct device_node *np;
-
                xc = kzalloc_node(sizeof(struct xive_cpu),
                                  GFP_KERNEL, cpu_to_node(cpu));
                if (!xc)
                        return -ENOMEM;
-               np = of_get_cpu_node(cpu, NULL);
-               if (np)
-                       xc->chip_id = of_get_ibm_chip_id(np);
-               of_node_put(np);
                xc->hw_ipi = XIVE_BAD_IRQ;
+               xc->chip_id = XIVE_INVALID_CHIP_ID;
+               if (xive_ops->prepare_cpu)
+                       xive_ops->prepare_cpu(cpu, xc);
 
                per_cpu(xive_cpu, cpu) = xc;
        }

diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
index 05a800a3104edda4591f3e49309122f4ece4737f..57e3f15404354601d44f8cb7228b06df8c41a396 100644 (file)
--- a/arch/powerpc/sysdev/xive/native.c
+++ b/arch/powerpc/sysdev/xive/native.c
@@ -380,6 +380,11 @@ static void xive_native_update_pending(struct xive_cpu *xc)
        }
 }
 
+static void xive_native_prepare_cpu(unsigned int cpu, struct xive_cpu *xc)
+{
+       xc->chip_id = cpu_to_chip_id(cpu);
+}
+
 static void xive_native_setup_cpu(unsigned int cpu, struct xive_cpu *xc)
 {
        s64 rc;
@@ -462,6 +467,7 @@ static const struct xive_ops xive_native_ops = {
        .match                  = xive_native_match,
        .shutdown               = xive_native_shutdown,
        .update_pending         = xive_native_update_pending,
+       .prepare_cpu            = xive_native_prepare_cpu,
        .setup_cpu              = xive_native_setup_cpu,
        .teardown_cpu           = xive_native_teardown_cpu,
        .sync_source            = xive_native_sync_source,

diff --git a/arch/powerpc/sysdev/xive/xive-internal.h b/arch/powerpc/sysdev/xive/xive-internal.h
index 9cf57c722faa3d1a0e1d3c29b1d203ea946ed504..6478be19b4d36f23cbcbd862b14da08828764f73 100644 (file)
--- a/arch/powerpc/sysdev/xive/xive-internal.h
+++ b/arch/powerpc/sysdev/xive/xive-internal.h
@@ -46,6 +46,7 @@ struct xive_ops {
                                  u32 *sw_irq);
        int     (*setup_queue)(unsigned int cpu, struct xive_cpu *xc, u8 prio);
        void    (*cleanup_queue)(unsigned int cpu, struct xive_cpu *xc, u8 prio);
+       void    (*prepare_cpu)(unsigned int cpu, struct xive_cpu *xc);
        void    (*setup_cpu)(unsigned int cpu, struct xive_cpu *xc);
        void    (*teardown_cpu)(unsigned int cpu, struct xive_cpu *xc);
        bool    (*match)(struct device_node *np);