| Message ID | 20230609071404.425529-1-hbathini@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b949ee6801f4a47ae0e02845242c99af351c4d26 |
| Headers | show |
| Series | [v2] powerpc/fadump: invoke ibm,os-term with rtas_call_unlocked() | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
On 2023-06-09 12:44:04 Fri, Hari Bathini wrote: > Invoke ibm,os-term call with rtas_call_unlocked(), without using the > RTAS spinlock, to avoid deadlock in the unlikely event of a machine > crash while making an RTAS call. > > Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> > --- > arch/powerpc/kernel/rtas.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c > index c087eeee320f..a8192e5b1a5f 100644 > --- a/arch/powerpc/kernel/rtas.c > +++ b/arch/powerpc/kernel/rtas.c > @@ -1587,6 +1587,7 @@ static bool ibm_extended_os_term; > void rtas_os_term(char *str) > { > s32 token = rtas_function_token(RTAS_FN_IBM_OS_TERM); > + static struct rtas_args args; > int status; > > /* > @@ -1607,7 +1608,8 @@ void rtas_os_term(char *str) > * schedules. > */ > do { > - status = rtas_call(token, 1, 1, NULL, __pa(rtas_os_term_buf)); > + rtas_call_unlocked(&args, token, 1, 1, NULL, __pa(rtas_os_term_buf)); > + status = be32_to_cpu(args.rets[0]); Looks good to me. Reviewed-by: Mahesh Salgaonkar <mahesh@linux.ibm.com> > } while (rtas_busy_delay_time(status)); Thanks, -Mahesh.
On Fri, 09 Jun 2023 12:44:04 +0530, Hari Bathini wrote: > Invoke ibm,os-term call with rtas_call_unlocked(), without using the > RTAS spinlock, to avoid deadlock in the unlikely event of a machine > crash while making an RTAS call. > > Applied to powerpc/next. [1/1] powerpc/fadump: invoke ibm,os-term with rtas_call_unlocked() https://git.kernel.org/powerpc/c/b949ee6801f4a47ae0e02845242c99af351c4d26 cheers
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index c087eeee320f..a8192e5b1a5f 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -1587,6 +1587,7 @@ static bool ibm_extended_os_term; void rtas_os_term(char *str) { s32 token = rtas_function_token(RTAS_FN_IBM_OS_TERM); + static struct rtas_args args; int status; /* @@ -1607,7 +1608,8 @@ void rtas_os_term(char *str) * schedules. */ do { - status = rtas_call(token, 1, 1, NULL, __pa(rtas_os_term_buf)); + rtas_call_unlocked(&args, token, 1, 1, NULL, __pa(rtas_os_term_buf)); + status = be32_to_cpu(args.rets[0]); } while (rtas_busy_delay_time(status)); if (status != 0)
Invoke ibm,os-term call with rtas_call_unlocked(), without using the RTAS spinlock, to avoid deadlock in the unlikely event of a machine crash while making an RTAS call. Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> --- arch/powerpc/kernel/rtas.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)