lkml.org 
[lkml]   [2020]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 063/118] powerpc/prom_init: Pass the "os-term" message to hypervisor
    Date
    From: Alexey Kardashevskiy <aik@ozlabs.ru>

    [ Upstream commit 74bb84e5117146fa73eb9d01305975c53022b3c3 ]

    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.

    Fixes: 6a9c930bd775 ("powerpc/prom_init: Add the ESM call to prom_init")
    Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20200312074404.87293-1-aik@ozlabs.ru
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/prom_init.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
    index eba9d4ee4baf6..689664cd4e79b 100644
    --- a/arch/powerpc/kernel/prom_init.c
    +++ b/arch/powerpc/kernel/prom_init.c
    @@ -1761,6 +1761,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.20.1


    \
     
     \ /
      Last update: 2020-04-22 12:45    [W:4.101 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site