Re: [PATCH] aspeed: watchdog: Add status function

[Eddie James]

On 03/26/2018 05:00 PM, Guenter Roeck wrote:
> On 03/26/2018 02:17 PM, Eddie James wrote:
> > Populate the status watchdog operation to return the "timeout status"
> > register of the ASPEED watchdog.
> >
> > Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxxxxxxx>
> > ---
> > Â drivers/watchdog/aspeed_wdt.c | 9 +++++++++
> > Â 1 file changed, 9 insertions(+)
> >
> > diff --git a/drivers/watchdog/aspeed_wdt.c 
> > b/drivers/watchdog/aspeed_wdt.c
> > index a5b8eb2..d6dd5c9 100644
> > --- a/drivers/watchdog/aspeed_wdt.c
> > +++ b/drivers/watchdog/aspeed_wdt.c
> > @@ -55,6 +55,7 @@ struct aspeed_wdt_config {
> > Â #defineÂÂ WDT_CTRL_WDT_INTRÂÂÂÂÂÂÂ BIT(2)
> > Â #defineÂÂ WDT_CTRL_RESET_SYSTEMÂÂÂÂÂÂÂ BIT(1)
> > Â #defineÂÂ WDT_CTRL_ENABLEÂÂÂÂÂÂÂ BIT(0)
> > +#define WDT_TIMEOUT_STATUSÂÂÂ 0x10
> > Â Â /*
> > ÂÂ * WDT_RESET_WIDTH controls the characteristics of the external 
> > pulse (if
> > @@ -138,6 +139,13 @@ static int aspeed_wdt_ping(struct 
> > watchdog_device *wdd)
> > ÂÂÂÂÂ return 0;
> > Â }
> > Â +static unsigned int aspeed_wdt_status(struct watchdog_device *wdd)
> > +{
> > +ÂÂÂ struct aspeed_wdt *wdt = to_aspeed_wdt(wdd);
> > +
> > +ÂÂÂ return readl(wdt->base + WDT_TIMEOUT_STATUS);
> > +}
>
> Does the register report WDIOF_* status flags/bits as defined in the 
> API ?
> This seems more than unlikely.

Ah, I see I'm misusing the API. It does not... I will rework.

Thanks,
Eddie

> Guenter
>
> > +
> > Â static int aspeed_wdt_set_timeout(struct watchdog_device *wdd,
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ unsigned int timeout)
> > Â {
> > @@ -171,6 +179,7 @@ static int aspeed_wdt_restart(struct 
> > watchdog_device *wdd,
> > ÂÂÂÂÂ .startÂÂÂÂÂÂÂ = aspeed_wdt_start,
> > ÂÂÂÂÂ .stopÂÂÂÂÂÂÂ = aspeed_wdt_stop,
> > ÂÂÂÂÂ .pingÂÂÂÂÂÂÂ = aspeed_wdt_ping,
> > +ÂÂÂ .statusÂÂÂÂÂÂÂ = aspeed_wdt_status,
> > ÂÂÂÂÂ .set_timeoutÂÂÂ = aspeed_wdt_set_timeout,
> > ÂÂÂÂÂ .restartÂÂÂ = aspeed_wdt_restart,
> > ÂÂÂÂÂ .ownerÂÂÂÂÂÂÂ = THIS_MODULE,