Hi, On Thu, Oct 29, 2026 at 02:31:00PM +0530, Shivendra Pratap wrote: > PSCI supports different types of resets like SYSTEM_RESET, SYSTEM_RESET2 > ARCH WARM reset and SYSTEM_RESET2 vendor-specific resets. Currently > there is no common driver that handles all supported psci resets at one > place. Additionally, there is no common mechanism to issue the supported > psci resets from userspace. > > Add psci-reboot-mode as an auxiliary device created by the psci-devices > driver. Define two types of PSCI resets, predefined-resets and > vendor-specific resets. Predefined-resets are defined by psci driver > and vendor-specific resets are defined by SoC vendors, under the > psci:reboot-mode node of SoC device tree. > > Register the driver with the reboot-mode framework to interface these > resets to userspace. When userspace initiates a supported command, pass > the reset arguments to the PSCI driver to enable command-based reset. > > This change allows userspace to issue supported PSCI reset commands > using the standard reboot system calls while enabling SoC vendors to > define their specific resets for PSCI. > > Suggested-by: Ulf Hansson > Suggested-by: Lee Jones > Suggested-by: Bartosz Golaszewski > Reviewed-by: Bartosz Golaszewski > Signed-off-by: Shivendra Pratap > --- > MAINTAINERS | 1 + > drivers/firmware/psci/psci-devices.c | 4 ++ > drivers/power/reset/Kconfig | 11 ++++ > drivers/power/reset/Makefile | 1 + > drivers/power/reset/psci-reboot-mode.c | 101 +++++++++++++++++++++++++++++++++ > 5 files changed, 118 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e4ca41cdd872..0e03826eec48 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -22292,6 +22292,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > F: Documentation/devicetree/bindings/arm/psci.yaml > F: drivers/firmware/psci/ > +F: drivers/power/reset/psci-reboot-mode.c > F: include/linux/psci.h > F: include/uapi/linux/psci.h > > diff --git a/drivers/firmware/psci/psci-devices.c b/drivers/firmware/psci/psci-devices.c > index d23befc490ed..04f24b8d9943 100644 > --- a/drivers/firmware/psci/psci-devices.c > +++ b/drivers/firmware/psci/psci-devices.c > @@ -20,6 +20,10 @@ static const struct arm_psci_device_info arm_psci_devices[] = { > { > .name = "psci-cpuidle-domain", > }, > + { > + .name = "psci-reboot-mode", > + .of_node_name = "reboot-mode", > + }, > }; > > static void arm_psci_auxiliary_device_release(struct device *dev) > diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig > index bce996bbef28..f165a41d40ed 100644 > --- a/drivers/power/reset/Kconfig > +++ b/drivers/power/reset/Kconfig > @@ -360,6 +360,17 @@ config NVMEM_REBOOT_MODE > then the bootloader can read it and take different > action according to the mode. > > +config PSCI_REBOOT_MODE > + bool "PSCI reboot mode driver" > + depends on ARM_PSCI_DEVICES > + select AUXILIARY_BUS > + select REBOOT_MODE > + help > + Say y here to enable the PSCI reboot mode driver. The driver > + registers with the reboot-mode framework to configure PSCI > + reset commands, which are executed by the PSCI driver during > + psci_sys_reset(). > + > config POWER_MLXBF > tristate "Mellanox BlueField power handling driver" > depends on (GPIO_MLXBF2 || GPIO_MLXBF3) && ACPI > diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile > index e31cab4ba78e..45d8aaaffaa1 100644 > --- a/drivers/power/reset/Makefile > +++ b/drivers/power/reset/Makefile > @@ -41,5 +41,6 @@ obj-$(CONFIG_REBOOT_MODE) += reboot-mode.o > obj-$(CONFIG_SYSCON_REBOOT_MODE) += syscon-reboot-mode.o > obj-$(CONFIG_POWER_RESET_SC27XX) += sc27xx-poweroff.o > obj-$(CONFIG_NVMEM_REBOOT_MODE) += nvmem-reboot-mode.o > +obj-$(CONFIG_PSCI_REBOOT_MODE) += psci-reboot-mode.o > obj-$(CONFIG_POWER_MLXBF) += pwr-mlxbf.o > obj-$(CONFIG_POWER_RESET_QEMU_VIRT_CTRL) += qemu-virt-ctrl.o > diff --git a/drivers/power/reset/psci-reboot-mode.c b/drivers/power/reset/psci-reboot-mode.c > new file mode 100644 > index 000000000000..c5dcfc40392a > --- /dev/null > +++ b/drivers/power/reset/psci-reboot-mode.c > @@ -0,0 +1,101 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* > + * Predefined modes use two arguments. arg1/magic[0] is always zero and > + * arg2/magic[1] is one of the values defined by enum psci_standard_resets. > + */ > +static const struct reboot_mode_entry psci_resets[] = { > + { > + .name = "psci-system-reset", > + .magic = { 0, PSCI_SYSTEM_RESET_COLD_RESET }, > + .count = 2, > + }, > + { > + .name = "psci-system-reset2-arch-warm-reset", > + .magic = { 0, PSCI_SYSTEM_RESET2_ARCH_WARM_RESET }, > + .count = 2, > + }, > +}; > + > +static u64 psci_reboot_mode_get_cookie(const u32 *magic, int count) > +{ > + u64 cookie = 0; > + int i; > + > + /* > + * For a 3-cell magic, arg2 is the high 32 bits and arg3 is the low 32 bits. > + * For a 2-cell magic, arg2 is the low 32 bits. > + */ > + for (i = 1; i < count; i++) > + cookie = (cookie << 32) | magic[i]; > + > + return cookie; > +} > + > +static int psci_reboot_mode_write(struct reboot_mode_driver *reboot, > + const u32 *magic, u32 count) > +{ > + if (count < 2 || count > 3) > + return -EINVAL; > + > + /* Unexpected value at magic[1]/arg2 on a 32-bit system. */ > + if (!IS_ENABLED(CONFIG_64BIT) && count == 3 && magic[1]) > + return -EINVAL; > + > + return psci_set_reset_cmd(magic[0], > + psci_reboot_mode_get_cookie(magic, count)); > +} > + > +static int psci_reboot_mode_probe(struct auxiliary_device *auxdev, > + const struct auxiliary_device_id *id) > +{ > + struct reboot_mode_driver *reboot; > + struct device *dev = &auxdev->dev; > + size_t count; > + int ret; > + > + reboot = devm_kzalloc(dev, sizeof(*reboot), GFP_KERNEL); > + if (!reboot) > + return -ENOMEM; reboot = devm_kzalloc_obj(dev, *reboot); Otherwise: Acked-by: Sebastian Reichel > + /* Skip PSCI SYSTEM_RESET2 modes if unsupported. */ > + count = psci_has_system_reset2_support() ? ARRAY_SIZE(psci_resets) : 1; > + > + ret = reboot_mode_driver_init(reboot, dev, NULL, > + psci_reboot_mode_write, psci_resets, > + count); > + if (ret) > + return ret; > + > + return devm_reboot_mode_register(dev, reboot); > +} > + > +static const struct auxiliary_device_id psci_reboot_mode_id_table[] = { > + { .name = "arm-psci.psci-reboot-mode" }, > + { } > +}; > +MODULE_DEVICE_TABLE(auxiliary, psci_reboot_mode_id_table); > + > +static struct auxiliary_driver psci_reboot_mode_driver = { > + .probe = psci_reboot_mode_probe, > + .id_table = psci_reboot_mode_id_table, > +}; > + > +static int __init psci_reboot_mode_init(void) > +{ > + return __auxiliary_driver_register(&psci_reboot_mode_driver, THIS_MODULE, > + "psci-reboot-mode"); > +} > +subsys_initcall(psci_reboot_mode_init); > > -- > 2.34.1 > >