diff options
| author | Nathan Lynch <nathanl@linux.ibm.com> | 2020-12-07 15:51:42 -0600 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-12-08 21:40:56 +1100 |
| commit | c3ae9781d5a64093f161e6cc5dfefb0773106ca9 (patch) | |
| tree | 8f63553732ba0eb2f505464b2eff1abdf6d56a03 /arch/powerpc/platforms/pseries/mobility.c | |
| parent | 2d5be6f16c4ba5c27d06704976daf55f3236a236 (diff) | |
| download | linux-c3ae9781d5a64093f161e6cc5dfefb0773106ca9.tar.bz2 | |
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: 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
Diffstat (limited to 'arch/powerpc/platforms/pseries/mobility.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/mobility.c | 15 |
1 files changed, 1 insertions, 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 |