diff options
| author | Bo Yan <byan@nvidia.com> | 2011-04-18 17:04:47 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-04 10:56:03 -0700 |
| commit | 9cf05750fa9824e06338d7a933f6c9cabcab3408 (patch) | |
| tree | dcffad0b9f7305653b4c8de4e9e93971d9f4cedd | |
| parent | 91dfac4c979393dd857a299d809000eb0a3b7115 (diff) | |
ARM: tegra: flush serial console earlier in reboot
This is to make sure this function will not cause any lock-up
during actual reboot
Should help bug 770426
Change-Id: Id5cfaee07d9438741b721b67c7cd342858e7b5cb
Reviewed-on: http://git-master/r/28345
Reviewed-on: http://git-master/r/30176
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 4504624cc1fd..84fc70387222 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -24,6 +24,9 @@ #include <linux/delay.h> #include <linux/highmem.h> #include <linux/memblock.h> +#include <linux/notifier.h> +#include <linux/reboot.h> +#include <linux/mqueue.h> #include <asm/hardware/cache-l2x0.h> #include <asm/system.h> @@ -128,17 +131,19 @@ static void __init tegra_init_power(void) static bool console_flushed; -static void tegra_pm_flush_console(void) +static int tegra_pm_flush_console(struct notifier_block *this, + unsigned long code, + void *unused) { if (console_flushed) - return; + return NOTIFY_NONE; console_flushed = true; printk("\n"); pr_emerg("Restarting %s\n", linux_banner); if (!try_acquire_console_sem()) { release_console_sem(); - return; + return NOTIFY_NONE; } mdelay(50); @@ -149,17 +154,23 @@ static void tegra_pm_flush_console(void) else pr_emerg("tegra_restart: Console was locked!\n"); release_console_sem(); + + return NOTIFY_NONE; } static void tegra_pm_restart(char mode, const char *cmd) { - tegra_pm_flush_console(); arm_machine_restart(mode, cmd); } +static struct notifier_block tegra_reboot_notifier = { + .notifier_call = tegra_pm_flush_console, +}; + void __init tegra_common_init(void) { arm_pm_restart = tegra_pm_restart; + register_reboot_notifier(&tegra_reboot_notifier); tegra_init_fuse(); tegra_init_clock(); tegra_clk_init_from_table(common_clk_init_table); |