On 05/30/2013 04:21 PM, Guenter Roeck wrote: > On Thu, May 30, 2013 at 04:15:45PM +0200, Michal Simek wrote: >> On 05/30/2013 04:07 PM, Guenter Roeck wrote: >>> On Thu, May 30, 2013 at 02:26:04PM +0200, Michal Simek wrote: >>>> Standard watchdog programs try to setup timeout >>>> via ioctl and this functionality should be implemented. >>>> Timeout value is hardcoded in the hardware but >>>> based on Documentation/watchdog/watchdog-api.txt >>>> can return the real timeout used in the same variable. >>>> >>>> Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx> >>>> --- >>>> drivers/watchdog/of_xilinx_wdt.c | 1 + >>>> 1 file changed, 1 insertion(+) >>>> >>>> diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c >>>> index 79f358c..a3bbe72 100644 >>>> --- a/drivers/watchdog/of_xilinx_wdt.c >>>> +++ b/drivers/watchdog/of_xilinx_wdt.c >>>> @@ -253,6 +253,7 @@ static long xwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) >>>> xwdt_keepalive(); >>>> return 0; >>>> >>>> + case WDIOC_SETTIMEOUT: >>>> case WDIOC_GETTIMEOUT: >>>> if (no_timeout) >>>> return -ENOTTY; >>> >>> Watchdog programs should check ident.options before trying to set the timeout. >>> If they don't, there is an application bug. I don't think it is a good idea >>> to start hacking the kernel to work around application bugs. >> >> Based on Documentation/watchdog/watchdog-api.txt >> >> "For some drivers it is possible to modify the watchdog timeout on the >> fly with the SETTIMEOUT ioctl, those drivers have the WDIOF_SETTIMEOUT >> flag set in their option field. The argument is an integer > > Yes, but WDIOF_SETTIMEOUT is not set in the driver's option field. ok. It means I should probably enable it. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
Attachment:
signature.asc
Description: OpenPGP digital signature