Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6c329a8 authored by Xiaoming Ni's avatar Xiaoming Ni Committed by Greg Kroah-Hartman
Browse files

powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found 



commit 3c2172c1c47b4079c29f0e6637d764a99355ebcd upstream.

When the field described in mpc85xx_smp_guts_ids[] is not configured in
dtb, the mpc85xx_setup_pmc() does not assign a value to the "guts"
variable. As a result, the oops is triggered when
mpc85xx_freeze_time_base() is executed.

Fixes: 56f1ba28 ("powerpc/mpc85xx: refactor the PM operations")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: default avatarXiaoming Ni <nixiaoming@huawei.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210929033646.39630-2-nixiaoming@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e611183

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

+1 −2
Original line number Diff line number Diff line
@@ -98,9 +98,8 @@ int __init mpc85xx_setup_pmc(void) 
			pr_err("Could not map guts node address\n");

			return -ENOMEM;

		}

	}



		qoriq_pm_ops = &mpc85xx_pm_ops;

	}



	return 0;

}