From: Michael Ellerman Date: Fri, 13 Mar 2020 11:57:26 +0000 Subject: Re: [PATCH kernel] powerpc/prom_init: Pass the "os-term" message to hypervisor Message-Id: <874kusxyah.fsf@mpe.ellerman.id.au> List-Id: References: <20200312074404.87293-1-aik@ozlabs.ru> In-Reply-To: <20200312074404.87293-1-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alexey Kardashevskiy , linuxppc-dev@lists.ozlabs.org Cc: Alexey Kardashevskiy , Ram Pai , kvm-ppc@vger.kernel.org, Thiago Jung Bauermann , David Gibson Alexey Kardashevskiy writes: > The "os-term" RTAS calls has one argument with a message address of > OS termination cause. rtas_os_term() already passes it but the recently > added prom_init's version of that missed it; it also does not fill args > correctly. > > This passes the message address and initializes the number of arguments. > > Signed-off-by: Alexey Kardashevskiy I added: Fixes: 6a9c930bd775 ("powerpc/prom_init: Add the ESM call to prom_init") cheers > diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c > index 577345382b23..673f13b87db1 100644 > --- a/arch/powerpc/kernel/prom_init.c > +++ b/arch/powerpc/kernel/prom_init.c > @@ -1773,6 +1773,9 @@ static void __init prom_rtas_os_term(char *str) > if (token = 0) > prom_panic("Could not get token for ibm,os-term\n"); > os_term_args.token = cpu_to_be32(token); > + os_term_args.nargs = cpu_to_be32(1); > + os_term_args.nret = cpu_to_be32(1); > + os_term_args.args[0] = cpu_to_be32(__pa(str)); > prom_rtas_hcall((uint64_t)&os_term_args); > } > #endif /* CONFIG_PPC_SVM */ > -- > 2.17.1