![Kees Cook](/assets/img/avatar_default.png)
This converts all remaining cases of the old setup_timer() API into using timer_setup(), where the callback argument is the structure already holding the struct timer_list. These should have no behavioral changes, since they just change which pointer is passed into the callback with the same available pointers after conversion. It handles the following examples, in addition to some other variations. Casting from unsigned long: void my_callback(unsigned long data) { struct something *ptr = (struct something *)data; ... } ... setup_timer(&ptr->my_timer, my_callback, ptr); and forced object casts: void my_callback(struct something *ptr) { ... } ... setup_timer(&ptr->my_timer, my_callback, (unsigned long)ptr); become: void my_callback(struct timer_list *t) { struct something *ptr = from_timer(ptr, t, my_timer); ... } ... timer_setup(&ptr->my_timer, my_callback, 0); Direct function assignments: void my_callback(unsigned long data) { struct something *ptr = (struct something *)data; ... } ... ptr->my_timer.function = my_callback; have a temporary cast added, along with converting the args: void my_callback(struct timer_list *t) { struct something *ptr = from_timer(ptr, t, my_timer); ... } ... ptr->my_timer.function = (TIMER_FUNC_TYPE)my_callback; And finally, callbacks without a data assignment: void my_callback(unsigned long data) { ... } ... setup_timer(&ptr->my_timer, my_callback, 0); have their argument renamed to verify they're unused during conversion: void my_callback(struct timer_list *unused) { ... } ... timer_setup(&ptr->my_timer, my_callback, 0); The conversion is done with the following Coccinelle script: spatch --very-quiet --all-includes --include-headers \ -I ./arch/x86/include -I ./arch/x86/include/generated \ -I ./include -I ./arch/x86/include/uapi \ -I ./arch/x86/include/generated/uapi -I ./include/uapi \ -I ./include/generated/uapi --include ./include/linux/kconfig.h \ --dir . \ --cocci-file ~/src/data/timer_setup.cocci @fix_address_of@ expression e; @@ setup_timer( -&(e) +&e , ...) // Update any raw setup_timer() usages that have a NULL callback, but // would otherwise match change_timer_function_usage, since the latter // will update all function assignments done in the face of a NULL // function initialization in setup_timer(). @change_timer_function_usage_NULL@ expression _E; identifier _timer; type _cast_data; @@ ( -setup_timer(&_E->_timer, NULL, _E); +timer_setup(&_E->_timer, NULL, 0); | -setup_timer(&_E->_timer, NULL, (_cast_data)_E); +timer_setup(&_E->_timer, NULL, 0); | -setup_timer(&_E._timer, NULL, &_E); +timer_setup(&_E._timer, NULL, 0); | -setup_timer(&_E._timer, NULL, (_cast_data)&_E); +timer_setup(&_E._timer, NULL, 0); ) @change_timer_function_usage@ expression _E; identifier _timer; struct timer_list _stl; identifier _callback; type _cast_func, _cast_data; @@ ( -setup_timer(&_E->_timer, _callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, &_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, &_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)&_callback, _E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E._timer, _callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, &_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, &_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)_E); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, (_cast_func)&_callback, (_cast_data)&_E); +timer_setup(&_E._timer, _callback, 0); | _E->_timer@_stl.function = _callback; | _E->_timer@_stl.function = &_callback; | _E->_timer@_stl.function = (_cast_func)_callback; | _E->_timer@_stl.function = (_cast_func)&_callback; | _E._timer@_stl.function = _callback; | _E._timer@_stl.function = &_callback; | _E._timer@_stl.function = (_cast_func)_callback; | _E._timer@_stl.function = (_cast_func)&_callback; ) // callback(unsigned long arg) @change_callback_handle_cast depends on change_timer_function_usage@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; identifier _handle; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { ( ... when != _origarg _handletype *_handle = -(_handletype *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle = -(void *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(_handletype *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg | ... when != _origarg _handletype *_handle; ... when != _handle _handle = -(void *)_origarg; +from_timer(_handle, t, _timer); ... when != _origarg ) } // callback(unsigned long arg) without existing variable @change_callback_handle_cast_no_arg depends on change_timer_function_usage && !change_callback_handle_cast@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _origtype; identifier _origarg; type _handletype; @@ void _callback( -_origtype _origarg +struct timer_list *t ) { + _handletype *_origarg = from_timer(_origarg, t, _timer); + ... when != _origarg - (_handletype *)_origarg + _origarg ... when != _origarg } // Avoid already converted callbacks. @match_callback_converted depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier t; @@ void _callback(struct timer_list *t) { ... } // callback(struct something *handle) @change_callback_handle_arg depends on change_timer_function_usage && !match_callback_converted && !change_callback_handle_cast && !change_callback_handle_cast_no_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; @@ void _callback( -_handletype *_handle +struct timer_list *t ) { + _handletype *_handle = from_timer(_handle, t, _timer); ... } // If change_callback_handle_arg ran on an empty function, remove // the added handler. @unchange_callback_handle_arg depends on change_timer_function_usage && change_callback_handle_arg@ identifier change_timer_function_usage._callback; identifier change_timer_function_usage._timer; type _handletype; identifier _handle; identifier t; @@ void _callback(struct timer_list *t) { - _handletype *_handle = from_timer(_handle, t, _timer); } // We only want to refactor the setup_timer() data argument if we've found // the matching callback. This undoes changes in change_timer_function_usage. @unchange_timer_function_usage depends on change_timer_function_usage && !change_callback_handle_cast && !change_callback_handle_cast_no_arg && !change_callback_handle_arg@ expression change_timer_function_usage._E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type change_timer_function_usage._cast_data; @@ ( -timer_setup(&_E->_timer, _callback, 0); +setup_timer(&_E->_timer, _callback, (_cast_data)_E); | -timer_setup(&_E._timer, _callback, 0); +setup_timer(&_E._timer, _callback, (_cast_data)&_E); ) // If we fixed a callback from a .function assignment, fix the // assignment cast now. @change_timer_function_assignment depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression change_timer_function_usage._E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_func; typedef TIMER_FUNC_TYPE; @@ ( _E->_timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -&_callback +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -(_cast_func)_callback; +(TIMER_FUNC_TYPE)_callback ; | _E->_timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -&_callback; +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -(_cast_func)_callback +(TIMER_FUNC_TYPE)_callback ; | _E._timer.function = -(_cast_func)&_callback +(TIMER_FUNC_TYPE)_callback ; ) // Sometimes timer functions are called directly. Replace matched args. @change_timer_function_calls depends on change_timer_function_usage && (change_callback_handle_cast || change_callback_handle_cast_no_arg || change_callback_handle_arg)@ expression _E; identifier change_timer_function_usage._timer; identifier change_timer_function_usage._callback; type _cast_data; @@ _callback( ( -(_cast_data)_E +&_E->_timer | -(_cast_data)&_E +&_E._timer | -_E +&_E->_timer ) ) // If a timer has been configured without a data argument, it can be // converted without regard to the callback argument, since it is unused. @match_timer_function_unused_data@ expression _E; identifier _timer; identifier _callback; @@ ( -setup_timer(&_E->_timer, _callback, 0); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, 0L); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E->_timer, _callback, 0UL); +timer_setup(&_E->_timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0L); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_E._timer, _callback, 0UL); +timer_setup(&_E._timer, _callback, 0); | -setup_timer(&_timer, _callback, 0); +timer_setup(&_timer, _callback, 0); | -setup_timer(&_timer, _callback, 0L); +timer_setup(&_timer, _callback, 0); | -setup_timer(&_timer, _callback, 0UL); +timer_setup(&_timer, _callback, 0); | -setup_timer(_timer, _callback, 0); +timer_setup(_timer, _callback, 0); | -setup_timer(_timer, _callback, 0L); +timer_setup(_timer, _callback, 0); | -setup_timer(_timer, _callback, 0UL); +timer_setup(_timer, _callback, 0); ) @change_callback_unused_data depends on match_timer_function_unused_data@ identifier match_timer_function_unused_data._callback; type _origtype; identifier _origarg; @@ void _callback( -_origtype _origarg +struct timer_list *unused ) { ... when != _origarg } Signed-off-by: Kees Cook <keescook@chromium.org>
247 lines
6 KiB
C
247 lines
6 KiB
C
/*
|
|
* Watchdog driver for Broadcom BCM47XX
|
|
*
|
|
* Copyright (C) 2008 Aleksandar Radovanovic <biblbroks@sezampro.rs>
|
|
* Copyright (C) 2009 Matthieu CASTET <castet.matthieu@free.fr>
|
|
* Copyright (C) 2012-2013 Hauke Mehrtens <hauke@hauke-m.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/bcm47xx_wdt.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/types.h>
|
|
#include <linux/watchdog.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/jiffies.h>
|
|
|
|
#define DRV_NAME "bcm47xx_wdt"
|
|
|
|
#define WDT_DEFAULT_TIME 30 /* seconds */
|
|
#define WDT_SOFTTIMER_MAX 255 /* seconds */
|
|
#define WDT_SOFTTIMER_THRESHOLD 60 /* seconds */
|
|
|
|
static int timeout = WDT_DEFAULT_TIME;
|
|
static bool nowayout = WATCHDOG_NOWAYOUT;
|
|
|
|
module_param(timeout, int, 0);
|
|
MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
|
|
__MODULE_STRING(WDT_DEFAULT_TIME) ")");
|
|
|
|
module_param(nowayout, bool, 0);
|
|
MODULE_PARM_DESC(nowayout,
|
|
"Watchdog cannot be stopped once started (default="
|
|
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
|
|
|
|
static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd)
|
|
{
|
|
return container_of(wdd, struct bcm47xx_wdt, wdd);
|
|
}
|
|
|
|
static int bcm47xx_wdt_hard_keepalive(struct watchdog_device *wdd)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
|
|
wdt->timer_set_ms(wdt, wdd->timeout * 1000);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_hard_start(struct watchdog_device *wdd)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_hard_stop(struct watchdog_device *wdd)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
|
|
wdt->timer_set(wdt, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_hard_set_timeout(struct watchdog_device *wdd,
|
|
unsigned int new_time)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
u32 max_timer = wdt->max_timer_ms;
|
|
|
|
if (new_time < 1 || new_time > max_timer / 1000) {
|
|
pr_warn("timeout value must be 1<=x<=%d, using %d\n",
|
|
max_timer / 1000, new_time);
|
|
return -EINVAL;
|
|
}
|
|
|
|
wdd->timeout = new_time;
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_restart(struct watchdog_device *wdd,
|
|
unsigned long action, void *data)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
|
|
wdt->timer_set(wdt, 1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct watchdog_ops bcm47xx_wdt_hard_ops = {
|
|
.owner = THIS_MODULE,
|
|
.start = bcm47xx_wdt_hard_start,
|
|
.stop = bcm47xx_wdt_hard_stop,
|
|
.ping = bcm47xx_wdt_hard_keepalive,
|
|
.set_timeout = bcm47xx_wdt_hard_set_timeout,
|
|
.restart = bcm47xx_wdt_restart,
|
|
};
|
|
|
|
static void bcm47xx_wdt_soft_timer_tick(struct timer_list *t)
|
|
{
|
|
struct bcm47xx_wdt *wdt = from_timer(wdt, t, soft_timer);
|
|
u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms);
|
|
|
|
if (!atomic_dec_and_test(&wdt->soft_ticks)) {
|
|
wdt->timer_set_ms(wdt, next_tick);
|
|
mod_timer(&wdt->soft_timer, jiffies + HZ);
|
|
} else {
|
|
pr_crit("Watchdog will fire soon!!!\n");
|
|
}
|
|
}
|
|
|
|
static int bcm47xx_wdt_soft_keepalive(struct watchdog_device *wdd)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
|
|
atomic_set(&wdt->soft_ticks, wdd->timeout);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_soft_start(struct watchdog_device *wdd)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
|
|
bcm47xx_wdt_soft_keepalive(wdd);
|
|
bcm47xx_wdt_soft_timer_tick(&wdt->soft_timer);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_soft_stop(struct watchdog_device *wdd)
|
|
{
|
|
struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
|
|
|
|
del_timer_sync(&wdt->soft_timer);
|
|
wdt->timer_set(wdt, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd,
|
|
unsigned int new_time)
|
|
{
|
|
if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) {
|
|
pr_warn("timeout value must be 1<=x<=%d, using %d\n",
|
|
WDT_SOFTTIMER_MAX, new_time);
|
|
return -EINVAL;
|
|
}
|
|
|
|
wdd->timeout = new_time;
|
|
return 0;
|
|
}
|
|
|
|
static const struct watchdog_info bcm47xx_wdt_info = {
|
|
.identity = DRV_NAME,
|
|
.options = WDIOF_SETTIMEOUT |
|
|
WDIOF_KEEPALIVEPING |
|
|
WDIOF_MAGICCLOSE,
|
|
};
|
|
|
|
static const struct watchdog_ops bcm47xx_wdt_soft_ops = {
|
|
.owner = THIS_MODULE,
|
|
.start = bcm47xx_wdt_soft_start,
|
|
.stop = bcm47xx_wdt_soft_stop,
|
|
.ping = bcm47xx_wdt_soft_keepalive,
|
|
.set_timeout = bcm47xx_wdt_soft_set_timeout,
|
|
.restart = bcm47xx_wdt_restart,
|
|
};
|
|
|
|
static int bcm47xx_wdt_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
bool soft;
|
|
struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev);
|
|
|
|
if (!wdt)
|
|
return -ENXIO;
|
|
|
|
soft = wdt->max_timer_ms < WDT_SOFTTIMER_THRESHOLD * 1000;
|
|
|
|
if (soft) {
|
|
wdt->wdd.ops = &bcm47xx_wdt_soft_ops;
|
|
timer_setup(&wdt->soft_timer, bcm47xx_wdt_soft_timer_tick, 0);
|
|
} else {
|
|
wdt->wdd.ops = &bcm47xx_wdt_hard_ops;
|
|
}
|
|
|
|
wdt->wdd.info = &bcm47xx_wdt_info;
|
|
wdt->wdd.timeout = WDT_DEFAULT_TIME;
|
|
wdt->wdd.parent = &pdev->dev;
|
|
ret = wdt->wdd.ops->set_timeout(&wdt->wdd, timeout);
|
|
if (ret)
|
|
goto err_timer;
|
|
watchdog_set_nowayout(&wdt->wdd, nowayout);
|
|
watchdog_set_restart_priority(&wdt->wdd, 64);
|
|
watchdog_stop_on_reboot(&wdt->wdd);
|
|
|
|
ret = watchdog_register_device(&wdt->wdd);
|
|
if (ret)
|
|
goto err_timer;
|
|
|
|
dev_info(&pdev->dev, "BCM47xx Watchdog Timer enabled (%d seconds%s%s)\n",
|
|
timeout, nowayout ? ", nowayout" : "",
|
|
soft ? ", Software Timer" : "");
|
|
return 0;
|
|
|
|
err_timer:
|
|
if (soft)
|
|
del_timer_sync(&wdt->soft_timer);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int bcm47xx_wdt_remove(struct platform_device *pdev)
|
|
{
|
|
struct bcm47xx_wdt *wdt = dev_get_platdata(&pdev->dev);
|
|
|
|
watchdog_unregister_device(&wdt->wdd);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver bcm47xx_wdt_driver = {
|
|
.driver = {
|
|
.name = "bcm47xx-wdt",
|
|
},
|
|
.probe = bcm47xx_wdt_probe,
|
|
.remove = bcm47xx_wdt_remove,
|
|
};
|
|
|
|
module_platform_driver(bcm47xx_wdt_driver);
|
|
|
|
MODULE_AUTHOR("Aleksandar Radovanovic");
|
|
MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
|
|
MODULE_DESCRIPTION("Watchdog driver for Broadcom BCM47xx");
|
|
MODULE_LICENSE("GPL");
|