powerpc/corenet: Change criteria to set MPIC_ENABLE_COREINT

Don't use ppc_md function comparison.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c8ef82ee5f2713f4c36eb5d2d49b0905c7472801.1630667612.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 8d60290998483ffdf76002b5658a692ce57384dd..17ae75d62518a014b36d9c9c0debfd0ef1873b57 100644 (file)
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -37,7 +37,7 @@ void __init corenet_gen_pic_init(void)
        unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU |
                MPIC_NO_RESET;
 
-       if (ppc_md.get_irq == mpic_get_coreint_irq)
+       if (!IS_ENABLED(CONFIG_HOTPLUG_CPU) && !IS_ENABLED(CONFIG_KEXEC_CORE))
                flags |= MPIC_ENABLE_COREINT;
 
        mpic = mpic_alloc(NULL, 0, flags, 0, 512, " OpenPIC  ");

diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index d5cb48b61bbd2a884b9a5d7661ba63a6b95d6908..dbcbaa4c06635a26c08b53947b57f1baf1eb1660 100644 (file)
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1404,10 +1404,8 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         * with device trees generated by older versions of QEMU.
         * fsl_version will be zero if MPIC_FSL is not set.
         */
-       if (fsl_version < 0x400 && (flags & MPIC_ENABLE_COREINT)) {
-               WARN_ON(ppc_md.get_irq != mpic_get_coreint_irq);
+       if (fsl_version < 0x400 && (flags & MPIC_ENABLE_COREINT))
                ppc_md.get_irq = mpic_get_irq;
-       }
 
        /* Reset */