Re: [PATCH v17 07/12] firmware: psci: Implement vendor-specific resets as reboot-mode

Kathiravan Thirumoorthy
2025-11-10T04:41:36Z

On 11/9/2025 8:07 PM, Shivendra Pratap wrote:
> +static int __init psci_init_vendor_reset(void)
> +{
> + struct reboot_mode_driver *reboot;
> + struct device_node *psci_np;
> + struct device_node *np;

We can take advantage of __cleanup() attribute to simply the code paths.

Declare the variables like below

struct device_node *psci_np __free(device_node) = NULL;
struct device_node *np __free(device_node) = NULL;

and get rid of the explicit of_node_put().

I think, we can take up this an improvement once this series landed. But
if you happen to respin to address other issues, please take care of
this as well.

> + int ret;
> +
> + if (!psci_system_reset2_supported)
> + return -EINVAL;
> +
> + psci_np = of_find_compatible_node(NULL, NULL, "arm,psci-1.0");
> + if (!psci_np)
> + return -ENODEV;
> +
> + np = of_find_node_by_name(psci_np, "reboot-mode");
> + if (!np) {
> + of_node_put(psci_np);
> + return -ENODEV;
> + }
> +
> + ret = atomic_notifier_chain_register(&panic_notifier_list, &psci_panic_block);
> + if (ret)
> + goto err_notifier;
> +
> + reboot = kzalloc(sizeof(*reboot), GFP_KERNEL);
> + if (!reboot) {
> + ret = -ENOMEM;
> + goto err_kzalloc;
> + }
> +
> + reboot->write = psci_set_vendor_sys_reset2;
> + reboot->driver_name = "psci";
> +
> + ret = reboot_mode_register(reboot, of_fwnode_handle(np));
> + if (ret)
> + goto err_register;
> +
> + of_node_put(psci_np);
> + of_node_put(np);
> + return 0;
> +
> +err_register:
> + kfree(reboot);
> +err_kzalloc:
> + atomic_notifier_chain_unregister(&panic_notifier_list, &psci_panic_block);
> +err_notifier:
> + of_node_put(psci_np);
> + of_node_put(np);
> + return ret;
> +}
> +late_initcall(psci_init_vendor_reset)