| Message ID | 20211130114406.110021-1-jonathanh@nvidia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [V3] soc/tegra: pmc: Add reboot notifier | expand |
30.11.2021 14:44, Jon Hunter пишет: > The Tegra PMC driver implements a restart handler that supports Tegra > specific reboot commands such as placing the device into 'recovery' mode > in order to reprogram the platform. This is accomplished by setting the > appropriate bit in the PMC scratch0 register prior to rebooting the > platform. > > For Tegra platforms that support PSCI or EFI, the default Tegra restart > handler is not called and the PSCI or EFI restart handler is called > instead. Hence, for Tegra platforms that support PSCI or EFI, the Tegra > specific reboot commands do not currently work. Fix this by moving the > code that programs the PMC scratch0 register into a separate reboot > notifier that will always be called on reboot. > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > Changes since V2: > - Don't call tegra_pmc_program_reboot_reason() a 2nd time from the > restart notifier. > > Changes since V1: > - Don't change the behaviour for writing scratch0 register when the > notifier is called. > > drivers/soc/tegra/pmc.c | 31 ++++++++++++++++++++++++++++--- > 1 file changed, 28 insertions(+), 3 deletions(-) Reviewed-by: Dmitry Osipenko <digetx@gmail.com> Tested-by: Dmitry Osipenko <digetx@gmail.com>
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 575d6d5b4294..6db0e31ac6fa 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -1064,10 +1064,8 @@ int tegra_pmc_cpu_remove_clamping(unsigned int cpuid) return tegra_powergate_remove_clamping(id); } -static int tegra_pmc_restart_notify(struct notifier_block *this, - unsigned long action, void *data) +static void tegra_pmc_program_reboot_reason(const char *cmd) { - const char *cmd = data; u32 value; value = tegra_pmc_scratch_readl(pmc, pmc->soc->regs->scratch0); @@ -1085,6 +1083,25 @@ static int tegra_pmc_restart_notify(struct notifier_block *this, } tegra_pmc_scratch_writel(pmc, value, pmc->soc->regs->scratch0); +} + +static int tegra_pmc_reboot_notify(struct notifier_block *this, + unsigned long action, void *data) +{ + if (action == SYS_RESTART) + tegra_pmc_program_reboot_reason(data); + + return NOTIFY_DONE; +} + +static struct notifier_block tegra_pmc_reboot_notifier = { + .notifier_call = tegra_pmc_reboot_notify, +}; + +static int tegra_pmc_restart_notify(struct notifier_block *this, + unsigned long action, void *data) +{ + u32 value; /* reset everything but PMC_SCRATCH0 and PMC_RST_STATUS */ value = tegra_pmc_readl(pmc, PMC_CNTRL); @@ -2890,6 +2907,14 @@ static int tegra_pmc_probe(struct platform_device *pdev) goto cleanup_sysfs; } + err = devm_register_reboot_notifier(&pdev->dev, + &tegra_pmc_reboot_notifier); + if (err) { + dev_err(&pdev->dev, "unable to register reboot notifier, %d\n", + err); + goto cleanup_debugfs; + } + err = register_restart_handler(&tegra_pmc_restart_handler); if (err) { dev_err(&pdev->dev, "unable to register restart handler, %d\n",
The Tegra PMC driver implements a restart handler that supports Tegra specific reboot commands such as placing the device into 'recovery' mode in order to reprogram the platform. This is accomplished by setting the appropriate bit in the PMC scratch0 register prior to rebooting the platform. For Tegra platforms that support PSCI or EFI, the default Tegra restart handler is not called and the PSCI or EFI restart handler is called instead. Hence, for Tegra platforms that support PSCI or EFI, the Tegra specific reboot commands do not currently work. Fix this by moving the code that programs the PMC scratch0 register into a separate reboot notifier that will always be called on reboot. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- Changes since V2: - Don't call tegra_pmc_program_reboot_reason() a 2nd time from the restart notifier. Changes since V1: - Don't change the behaviour for writing scratch0 register when the notifier is called. drivers/soc/tegra/pmc.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)