Commit f82cdc37 authored by Russell Currey's avatar Russell Currey Committed by Michael Ellerman
Browse files

powerpc/pseries: Avoid hcall in plpks_is_available() on non-pseries 



plpks_is_available() can be called on any platform via kexec but calls
_plpks_get_config() which makes a hcall, which will only work on pseries.
Fix this by returning early in plpks_is_available() if hcalls aren't
possible.

Fixes: 119da30d ("powerpc/pseries: Expose PLPKS config values, support additional fields")
Reported-by: default avatarMurphy Zhou <jencce.kernel@gmail.com>
Signed-off-by: default avatarRussell Currey <ruscur@russell.cc>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230222021708.146257-1-ruscur@russell.cc
parent bec46462

arch/powerpc/platforms/pseries/plpks.c

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/hvcall.h>

#include <asm/machdep.h>

#include <asm/plpks.h>

#include <asm/firmware.h>



static u8 *ospassword;

static u16 ospasswordlength;
@@ -377,6 +378,9 @@ bool plpks_is_available(void) 
{

	int rc;



	if (!firmware_has_feature(FW_FEATURE_LPAR))

		return false;



	rc = _plpks_get_config();

	if (rc)

		return false;