Commit 66ada290 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/corenet: Change criteria to set MPIC_ENABLE_COREINT 



Don't use ppc_md function comparison.

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

arch/powerpc/platforms/85xx/corenet_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -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  ");

arch/powerpc/sysdev/mpic.c

+1 −3
Original line number Diff line number Diff line
@@ -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 */