x86/platform/intel-mid: Register watchdog device after SCU
Subsystems (2)
PATCH 1/1 x86/platform/intel-mid: Register watchdog device after SCU
Watchdog device in Intel Tangier relies on SCU to be present. It uses the SCU IPC channel to send commands and receive responses. If watchdog driver is initialized quite before SCU and a command has been sent the result is always an error like the following:
intel_mid_wdt: Error stopping watchdog: 0xffffffed
Register watchdog device whne SCU is ready to avoid described issue.
--- .../platform/intel-mid/device_libs/platform_wdt.c | 33 ++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-)
arch/x86/platform/intel-mid/device_libs/platform_wdt.c +28 -5
@@ -14,7 +14,9 @@#include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/platform_data/intel-mid_wdt.h> +#include <asm/intel-mid.h> +#include <asm/intel_scu_ipc.h> #include <asm/io_apic.h> #define TANGIER_EXT_TIMER0_MSI 15
@@ -50,14 +52,35 @@ static struct intel_mid_wdt_pdata tangier_pdata = { .probe = tangier_probe, }; -static int __init register_mid_wdt (void ) +static int wdt_scu_status_change (struct notifier_block *nb, +unsigned long code,void *data) { -if (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_TANGIER ) { - wdt_dev.dev.platform_data = &tangier_pdata; -return platform_device_register (&wdt_dev); +if (code ==SCU_DOWN ) { +platform_device_unregister (&wdt_dev); +return 0 ; } -return -ENODEV ; +return platform_device_register (&wdt_dev); +} + +static int __init register_mid_wdt (void ) +{ +static struct notifier_block wdt_scu_notifier = { + .notifier_call = wdt_scu_status_change, + }; + +if (intel_mid_identify_cpu () !=INTEL_MID_CPU_CHIP_TANGIER ) +return -ENODEV ; + + wdt_dev.dev.platform_data = &tangier_pdata; + +/* +* We need to be sure that the SCU IPC is ready before watchdog device +* can be registered. +*/ +intel_scu_notifier_add (&wdt_scu_notifier); + +return 0 ; }rootfs_initcall (register_mid_wdt);
Signature · 1 line
2.10.2
tip-bot for Andy Shevchenko
merge botx86/platform/intel-mid: Register watchdog device after SCU
Commit-ID: 8c5c86fb6abec7d76ec4d51a46714161bceab315 Gitweb: http://git.kernel.org/tip/8c5c86fb6abec7d76ec4d51a46714161bceab315 Author: Andy Shevchenko <[email protected]> AuthorDate: Fri, 18 Nov 2016 18:52:24 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 21 Nov 2016 10:59:14 +0100
x86/platform/intel-mid: Register watchdog device after SCU
Watchdog device in Intel Tangier relies on SCU to be present. It uses the SCU IPC channel to send commands and receive responses. If watchdog driver is initialized quite before SCU and a command has been sent the result is always an error like the following:
intel_mid_wdt: Error stopping watchdog: 0xffffffed
Register watchdog device whne SCU is ready to avoid described issue.
--- .../platform/intel-mid/device_libs/platform_wdt.c | 32 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-)
arch/x86/platform/intel-mid/device_libs/platform_wdt.c +27 -5
@@ -14,7 +14,9 @@#include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/platform_data/intel-mid_wdt.h> +#include <asm/intel-mid.h> +#include <asm/intel_scu_ipc.h> #include <asm/io_apic.h> #define TANGIER_EXT_TIMER0_MSI 15
@@ -50,14 +52,34 @@ static struct intel_mid_wdt_pdata tangier_pdata = { .probe = tangier_probe, }; -static int __init register_mid_wdt (void ) +static int wdt_scu_status_change (struct notifier_block *nb, +unsigned long code,void *data) { -if (intel_mid_identify_cpu () ==INTEL_MID_CPU_CHIP_TANGIER ) { - wdt_dev.dev.platform_data = &tangier_pdata; -return platform_device_register (&wdt_dev); +if (code ==SCU_DOWN ) { +platform_device_unregister (&wdt_dev); +return 0 ; } -return -ENODEV ; +return platform_device_register (&wdt_dev); } +static struct notifier_block wdt_scu_notifier = { + .notifier_call = wdt_scu_status_change, +}; + +static int __init register_mid_wdt (void ) +{ +if (intel_mid_identify_cpu () !=INTEL_MID_CPU_CHIP_TANGIER ) +return -ENODEV ; + + wdt_dev.dev.platform_data = &tangier_pdata; + +/* +* We need to be sure that the SCU IPC is ready before watchdog device +* can be registered: +*/ +intel_scu_notifier_add (&wdt_scu_notifier); + +return 0 ; +}rootfs_initcall (register_mid_wdt);