aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/pseries/rtas-work-area.c
diff options
context:
space:
mode:
authorGravatar Nathan Lynch <nathanl@linux.ibm.com> 2023-02-10 12:42:08 -0600
committerGravatar Michael Ellerman <mpe@ellerman.id.au> 2023-02-13 22:35:03 +1100
commit08273c9f619cb32fb041935724f576e607101f3b (patch)
tree49017ed6ba9e8a9dec74342d86a4fe425d6a3303 /arch/powerpc/platforms/pseries/rtas-work-area.c
parentpowerpc/rtas: introduce rtas_function_token() API (diff)
downloadlinux-08273c9f619cb32fb041935724f576e607101f3b.tar.gz
linux-08273c9f619cb32fb041935724f576e607101f3b.tar.bz2
linux-08273c9f619cb32fb041935724f576e607101f3b.zip
powerpc/rtas: arch-wide function token lookup conversions
With the tokens for all implemented RTAS functions now available via rtas_function_token(), which is optimal and safe for arbitrary contexts, there is no need to use rtas_token() or cache its result. Most conversions are trivial, but a few are worth describing in more detail: * Error injection token comparisons for lockdown purposes are consolidated into a simple predicate: token_is_restricted_errinjct(). * A couple of special cases in block_rtas_call() do not use rtas_token() but perform string comparisons against names in the function table. These are converted to compare against token values instead, which is logically equivalent but less expensive. * The lookup for the ibm,os-term token can be deferred until needed, instead of caching it at boot to avoid device tree traversal during panic. * Since rtas_function_token() accesses a read-only data structure without taking any locks, xmon's lookup of set-indicator can be performed as needed instead of cached at startup. Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20230125-b4-powerpc-rtas-queue-v3-20-26929c8cce78@linux.ibm.com
Diffstat (limited to 'arch/powerpc/platforms/pseries/rtas-work-area.c')
-rw-r--r--arch/powerpc/platforms/pseries/rtas-work-area.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/rtas-work-area.c b/arch/powerpc/platforms/pseries/rtas-work-area.c
index 1ee63335bd4b..b37d52f40360 100644
--- a/arch/powerpc/platforms/pseries/rtas-work-area.c
+++ b/arch/powerpc/platforms/pseries/rtas-work-area.c
@@ -203,7 +203,7 @@ void __init rtas_work_area_reserve_arena(const phys_addr_t limit)
* So set up the arena if we find that, with a fallback to
* ibm,configure-connector, just in case.
*/
- if (rtas_service_present("ibm,get-system-parameter") ||
- rtas_service_present("ibm,configure-connector"))
+ if (rtas_function_implemented(RTAS_FN_IBM_GET_SYSTEM_PARAMETER) ||
+ rtas_function_implemented(RTAS_FN_IBM_CONFIGURE_CONNECTOR))
rwa_state.arena = memblock_alloc_try_nid(size, align, min, limit, nid);
}