mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
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
This commit is contained in:
parent
fae65a9ac8
commit
66ada29078
2 changed files with 2 additions and 4 deletions
|
@ -37,7 +37,7 @@ void __init corenet_gen_pic_init(void)
|
||||||
unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU |
|
unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU |
|
||||||
MPIC_NO_RESET;
|
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;
|
flags |= MPIC_ENABLE_COREINT;
|
||||||
|
|
||||||
mpic = mpic_alloc(NULL, 0, flags, 0, 512, " OpenPIC ");
|
mpic = mpic_alloc(NULL, 0, flags, 0, 512, " OpenPIC ");
|
||||||
|
|
|
@ -1404,10 +1404,8 @@ struct mpic * __init mpic_alloc(struct device_node *node,
|
||||||
* with device trees generated by older versions of QEMU.
|
* with device trees generated by older versions of QEMU.
|
||||||
* fsl_version will be zero if MPIC_FSL is not set.
|
* fsl_version will be zero if MPIC_FSL is not set.
|
||||||
*/
|
*/
|
||||||
if (fsl_version < 0x400 && (flags & MPIC_ENABLE_COREINT)) {
|
if (fsl_version < 0x400 && (flags & MPIC_ENABLE_COREINT))
|
||||||
WARN_ON(ppc_md.get_irq != mpic_get_coreint_irq);
|
|
||||||
ppc_md.get_irq = mpic_get_irq;
|
ppc_md.get_irq = mpic_get_irq;
|
||||||
}
|
|
||||||
|
|
||||||
/* Reset */
|
/* Reset */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue