From c3ae9781d5a64093f161e6cc5dfefb0773106ca9 Mon Sep 17 00:00:00 2001

From: Nathan Lynch <nathanl@linux.ibm.com>

Date: Mon, 7 Dec 2020 15:51:42 -0600

Subject: [PATCH] powerpc/pseries/mobility: use rtas_activate_firmware() on

 resume

References: bsc#1181674 ltc#189159

Patch-mainline: v5.11-rc1

Git-commit: c3ae9781d5a64093f161e6cc5dfefb0773106ca9

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: Nathan Lynch <nathanl@linux.ibm.com>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Link: https://lore.kernel.org/r/20201207215200.1785968-11-nathanl@linux.ibm.com

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/platforms/pseries/mobility.c | 15 +--------------

 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c

index 31d81b7da961..01ac7c03558e 100644

--- a/arch/powerpc/platforms/pseries/mobility.c

+++ b/arch/powerpc/platforms/pseries/mobility.c

@@ -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

-- 

2.26.2