Commit c3ae9781 authored by Nathan Lynch's avatar Nathan Lynch Committed by Michael Ellerman
Browse files

powerpc/pseries/mobility: use rtas_activate_firmware() on resume 



It's incorrect to abort post-suspend processing if
ibm,activate-firmware isn't available. Use rtas_activate_firmware(),
which logs this condition appropriately and allows us to proceed.

Signed-off-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201207215200.1785968-11-nathanl@linux.ibm.com
parent 2d5be6f1

arch/powerpc/platforms/pseries/mobility.c

+1 −14
Original line number Diff line number Diff line
@@ -312,21 +312,8 @@ int pseries_devicetree_update(s32 scope) 
void post_mobility_fixup(void)

{

	int rc;

	int activate_fw_token;



	activate_fw_token = rtas_token("ibm,activate-firmware");

	if (activate_fw_token == RTAS_UNKNOWN_SERVICE) {

		printk(KERN_ERR "Could not make post-mobility "

		       "activate-fw call.\n");

		return;

	}



	do {

		rc = rtas_call(activate_fw_token, 0, 1, NULL);

	} while (rtas_busy_delay(rc));



	if (rc)

		printk(KERN_ERR "Post-mobility activate-fw failed: %d\n", rc);

	rtas_activate_firmware();



	/*

	 * We don't want CPUs to go online/offline while the device