Skip to content

Commit cef1392

Browse files
Marc Zyngierwilldeacon
authored andcommitted
firmware/psci: Don't register with debugfs if PSCI isn't available
Contrary to popular belief, PSCI is not a universal property of an ARM/arm64 system. There is a garden variety of systems out there that don't (or even cannot) implement it. I'm the first one deplore such a situation, but hey... On such systems, a "cat /sys/kernel/debug/psci" results in fireworks, as no invocation callback is registered. Check for the invoke_psci_fn and psci_ops.get_version pointers before registering with the debugfs subsystem, avoiding the issue altogether. Fixes: 3137f2e ("firmware/psci: Add debugfs support to ease debugging") Reported-by: Hector Martin <marcan@marcan.st> Signed-off-by: Marc Zyngier <maz@kernel.org> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Mark Brown <broonie@kernel.org> Cc: Ulf Hansson <ulf.hansson@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org> Reviewed-by: Hector Martin <marcan@marcan.st> Acked-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20230105090834.630238-1-maz@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
1 parent f3dc61c commit cef1392

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/firmware/psci/psci.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,9 @@ static const struct file_operations psci_debugfs_ops = {
440440

441441
static int __init psci_debugfs_init(void)
442442
{
443+
if (!invoke_psci_fn || !psci_ops.get_version)
444+
return 0;
445+
443446
return PTR_ERR_OR_ZERO(debugfs_create_file("psci", 0444, NULL, NULL,
444447
&psci_debugfs_ops));
445448
}

0 commit comments

Comments
 (0)