From: Russell Currey <ruscur@xxxxxxxxxx>
commit f82cdc37c4bd4ba905bf99ade9782a639b5c12e9 upstream.
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: 119da30d037d ("powerpc/pseries: Expose PLPKS config values, support additional fields")
Reported-by: Murphy Zhou <jencce.kernel@xxxxxxxxx>
Signed-off-by: Russell Currey <ruscur@xxxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230222021708.146257-1-ruscur@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/platforms/pseries/plpks.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/arch/powerpc/platforms/pseries/plpks.c
+++ b/arch/powerpc/platforms/pseries/plpks.c
@@ -19,6 +19,7 @@
#include <asm/hvcall.h>
#include <asm/machdep.h>
#include <asm/plpks.h>
+#include <asm/firmware.h>
static u8 *ospassword;
static u16 ospasswordlength;
@@ -357,6 +358,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;
Patches currently in stable-queue which might be from ruscur@xxxxxxxxxx are
queue-6.1/powerpc-pseries-expose-plpks-config-values-support-a.patch
queue-6.1/powerpc-pseries-avoid-hcall-in-plpks_is_available-on-non-pseries.patch
queue-6.1/powerpc-pseries-fix-alignment-of-plpks-structures-an.patch
queue-6.1/powerpc-pseries-move-plpks.h-to-include-directory.patch
queue-6.1/powerpc-pseries-add-helper-to-get-plpks-password-len.patch
