[U-Boot] [PATCH v1 1/3] wdt: Fix spelling Resettting -> Resetting
Fix spelling Resettting -> Resetting. No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- drivers/watchdog/wdt-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index ab8a64c354..bb9ae80866 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -48,7 +48,7 @@ int wdt_expire_now(struct udevice *dev, ulong flags) int ret = 0; const struct wdt_ops *ops;
- debug("WDT Resettting: %lu\n", flags); + debug("WDT Resetting: %lu\n", flags); ops = device_get_ops(dev); if (ops->expire_now) { return ops->expire_now(dev, flags);
Timeout in some abstract ticks is not what we are applying to get deterministic behaviour.
Convert name to show explicitly that we are using microseconds (for watchdog it's more than precise).
No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index bb9ae80866..1715a98452 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -13,14 +13,14 @@
DECLARE_GLOBAL_DATA_PTR;
-int wdt_start(struct udevice *dev, u64 timeout, ulong flags) +int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags) { const struct wdt_ops *ops = device_get_ops(dev);
if (!ops->start) return -ENOSYS;
- return ops->start(dev, timeout, flags); + return ops->start(dev, timeout_us, flags); }
int wdt_stop(struct udevice *dev) diff --git a/include/wdt.h b/include/wdt.h index 0b5f05851a..115e8c6baf 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -21,12 +21,12 @@ * Start the timer * * @dev: WDT Device - * @timeout: Number of ticks before timer expires + * @timeout_us: Number of microseconds before timer expires * @flags: Driver specific flags. This might be used to specify * which action needs to be executed when the timer expires * @return: 0 if OK, -ve on error */ -int wdt_start(struct udevice *dev, u64 timeout, ulong flags); +int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags);
/* * Stop the timer, thus disabling the Watchdog. Use wdt_start to start it again. @@ -67,12 +67,12 @@ struct wdt_ops { * Start the timer * * @dev: WDT Device - * @timeout: Number of ticks before the timer expires + * @timeout_us: Number of microseconds before the timer expires * @flags: Driver specific flags. This might be used to specify * which action needs to be executed when the timer expires * @return: 0 if OK, -ve on error */ - int (*start)(struct udevice *dev, u64 timeout, ulong flags); + int (*start)(struct udevice *dev, u64 timeout_us, ulong flags); /* * Stop the timer *
On Thu, Jul 6, 2017 at 1:44 AM, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
Timeout in some abstract ticks is not what we are applying to get deterministic behaviour.
Convert name to show explicitly that we are using microseconds (for watchdog it's more than precise).
No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hello Andy,
Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
Timeout in some abstract ticks is not what we are applying to get deterministic behaviour.
Convert name to show explicitly that we are using microseconds (for watchdog it's more than precise).
No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
Reviewed-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index bb9ae80866..1715a98452 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -13,14 +13,14 @@
DECLARE_GLOBAL_DATA_PTR;
-int wdt_start(struct udevice *dev, u64 timeout, ulong flags) +int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags) { const struct wdt_ops *ops = device_get_ops(dev);
if (!ops->start) return -ENOSYS;
- return ops->start(dev, timeout, flags);
return ops->start(dev, timeout_us, flags); }
int wdt_stop(struct udevice *dev)
diff --git a/include/wdt.h b/include/wdt.h index 0b5f05851a..115e8c6baf 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -21,12 +21,12 @@
- Start the timer
- @dev: WDT Device
- @timeout: Number of ticks before timer expires
*/
- @timeout_us: Number of microseconds before timer expires
- @flags: Driver specific flags. This might be used to specify
- which action needs to be executed when the timer expires
- @return: 0 if OK, -ve on error
-int wdt_start(struct udevice *dev, u64 timeout, ulong flags); +int wdt_start(struct udevice *dev, u64 timeout_us, ulong flags);
/*
- Stop the timer, thus disabling the Watchdog. Use wdt_start to start it again.
@@ -67,12 +67,12 @@ struct wdt_ops { * Start the timer * * @dev: WDT Device
* @timeout: Number of ticks before the timer expires
* @timeout_us: Number of microseconds before the timer expires*/
- @flags: Driver specific flags. This might be used to specify
- which action needs to be executed when the timer expires
- @return: 0 if OK, -ve on error
- int (*start)(struct udevice *dev, u64 timeout, ulong flags);
- int (*start)(struct udevice *dev, u64 timeout_us, ulong flags); /*
- Stop the timer
Hi Andy,
On 5 July 2017 at 11:44, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
Timeout in some abstract ticks is not what we are applying to get deterministic behaviour.
A tick is always milliseconds in U-Boot, as I understand it.
Convert name to show explicitly that we are using microseconds (for watchdog it's more than precise).
Do you want microseconds, or is milliseconds enough accuracy? I have a hard time imagining a case where a microsecond watchdog timeout is useful.
No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
Regards, Simon
On Thu, 2017-07-06 at 21:59 -0600, Simon Glass wrote:
Hi Andy,
On 5 July 2017 at 11:44, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
Timeout in some abstract ticks is not what we are applying to get deterministic behaviour.
A tick is always milliseconds in U-Boot, as I understand it.
You see, there is a confusion. I would like to see units somewhere there, to make it clear.
Convert name to show explicitly that we are using microseconds (for watchdog it's more than precise).
Do you want microseconds, or is milliseconds enough accuracy? I have a hard time imagining a case where a microsecond watchdog timeout is useful.
For me ticks sounded like processor cycles (nanosecond-ish). So, milliseconds are better.
Since I have not much time, feel free to drop, modify, etc. Thanks for review.
No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 4 ++-- include/wdt.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
Regards, Simon
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index e788e1b65d..8ec094d994 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -65,7 +65,7 @@ void hw_watchdog_init(void) /* reset to disable the watchdog */ hw_watchdog_reset(); /* set timer in miliseconds */ - designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS); + designware_wdt_settimeout(CONFIG_WATCHDOG_TIMEOUT_MSECS); /* enable the watchdog */ designware_wdt_enable(); /* reset the watchdog */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index fd18ae5f5d..c17814bf01 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -131,7 +131,7 @@ #define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 30000 +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 #endif
/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 95f27b6ead..73701bcaf8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1121,7 +1121,6 @@ CONFIG_HUSH_INIT_VAR CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS -CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CMD_TREE
On Wed, 2017-07-05 at 20:44 +0300, Andy Shevchenko wrote:
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Yes, I know about WATCHDOG_TIMEOUT, I spent too much time already on this crap. Feel free to make a follow up to move from WATCHDOG_TIMEOUT to WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index e788e1b65d..8ec094d994 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -65,7 +65,7 @@ void hw_watchdog_init(void) /* reset to disable the watchdog */ hw_watchdog_reset(); /* set timer in miliseconds */
- designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS);
- designware_wdt_settimeout(CONFIG_WATCHDOG_TIMEOUT_MSECS);
/* enable the watchdog */ designware_wdt_enable(); /* reset the watchdog */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index fd18ae5f5d..c17814bf01 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -131,7 +131,7 @@ #define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 30000 +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 #endif /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 95f27b6ead..73701bcaf8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1121,7 +1121,6 @@ CONFIG_HUSH_INIT_VAR CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS -CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CMD_TREE
On Thu, Jul 6, 2017 at 1:44 AM, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hello Andy,
Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
Good catch!
May I ask, if you find time to move CONFIG_WATCHDOG_TIMEOUT_MSECS to Kconfig?
Reviewed-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index e788e1b65d..8ec094d994 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -65,7 +65,7 @@ void hw_watchdog_init(void) /* reset to disable the watchdog */ hw_watchdog_reset(); /* set timer in miliseconds */
- designware_wdt_settimeout(CONFIG_HW_WATCHDOG_TIMEOUT_MS);
- designware_wdt_settimeout(CONFIG_WATCHDOG_TIMEOUT_MSECS); /* enable the watchdog */ designware_wdt_enable(); /* reset the watchdog */
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index fd18ae5f5d..c17814bf01 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -131,7 +131,7 @@ #define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_CLOCK_KHZ 25000 -#define CONFIG_HW_WATCHDOG_TIMEOUT_MS 30000 +#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 #endif
/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 95f27b6ead..73701bcaf8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1121,7 +1121,6 @@ CONFIG_HUSH_INIT_VAR CONFIG_HVBOOT CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS -CONFIG_HW_WATCHDOG_TIMEOUT_MS CONFIG_I2C CONFIG_I2C_CHIPADDRESS CONFIG_I2C_CMD_TREE
On 5 July 2017 at 11:44, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/designware_wdt.c | 2 +- include/configs/socfpga_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Wed, Jul 05, 2017 at 08:44:08PM +0300, Andy Shevchenko wrote:
There is no need to duplicate same option with different name.
Kill HW_WATCHDOG_TIMEOUT_MS in favor of WATCHDOG_TIMEOUT_MSECS.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Reviewed-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
On Thu, Jul 6, 2017 at 1:44 AM, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
Fix spelling Resettting -> Resetting. No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hello Andy,
Am 05.07.2017 um 19:44 schrieb Andy Shevchenko:
Fix spelling Resettting -> Resetting. No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks!
Reviewed-by: Heiko Schocher hs@denx.de
bye, Heiko
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index ab8a64c354..bb9ae80866 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -48,7 +48,7 @@ int wdt_expire_now(struct udevice *dev, ulong flags) int ret = 0; const struct wdt_ops *ops;
- debug("WDT Resettting: %lu\n", flags);
- debug("WDT Resetting: %lu\n", flags); ops = device_get_ops(dev); if (ops->expire_now) { return ops->expire_now(dev, flags);
On 5 July 2017 at 11:44, Andy Shevchenko andriy.shevchenko@linux.intel.com wrote:
Fix spelling Resettting -> Resetting. No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
drivers/watchdog/wdt-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Wed, Jul 05, 2017 at 08:44:06PM +0300, Andy Shevchenko wrote:
Fix spelling Resettting -> Resetting. No functional change intended.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com Reviewed-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Heiko Schocher hs@denx.de
Applied to u-boot/master, thanks!
participants (5)
-
Andy Shevchenko -
Bin Meng -
Heiko Schocher -
Simon Glass -
Tom Rini