Message ID | 20210512084724.14634-11-shruthi.sanil@intel.com |
---|---|
State | Superseded |
Headers | show |
Series | Intel Keem Bay WDT bug fixes | expand |
On Wed, May 12, 2021 at 02:17:24PM +0530, shruthi.sanil@intel.com wrote: > From: Shruthi Sanil <shruthi.sanil@intel.com> > > Corrected typos, aligned the tabs and added new lines > wherever required for better readability > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Tested-by: Kris Pan <kris.pan@intel.com> > Signed-off-by: Shruthi Sanil <shruthi.sanil@intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/keembay_wdt.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c > index 0a8cf5b35699..6a2699021263 100644 > --- a/drivers/watchdog/keembay_wdt.c > +++ b/drivers/watchdog/keembay_wdt.c > @@ -26,11 +26,14 @@ > #define WDT_TH_INT_MASK BIT(8) > #define WDT_TO_INT_MASK BIT(9) > #define WDT_INT_CLEAR_SMC 0x8200ff18 > + > #define WDT_UNLOCK 0xf1d0dead > #define WDT_DISABLE 0x0 > #define WDT_ENABLE 0x1 > + > #define WDT_LOAD_MAX U32_MAX > #define WDT_LOAD_MIN 1 > + > #define WDT_TIMEOUT 5 > #define WDT_PRETIMEOUT 4 > > @@ -144,7 +147,7 @@ static irqreturn_t keembay_wdt_to_isr(int irq, void *dev_id) > struct arm_smccc_res res; > > arm_smccc_smc(WDT_INT_CLEAR_SMC, WDT_TO_INT_MASK, 0, 0, 0, 0, 0, 0, &res); > - dev_crit(wdt->wdd.parent, "Intel Keem Bay non-sec wdt timeout.\n"); > + dev_crit(wdt->wdd.parent, "Intel Keem Bay non-secure wdt timeout.\n"); > emergency_restart(); > > return IRQ_HANDLED; > @@ -158,7 +161,7 @@ static irqreturn_t keembay_wdt_th_isr(int irq, void *dev_id) > keembay_wdt_set_pretimeout(&wdt->wdd, 0x0); > > arm_smccc_smc(WDT_INT_CLEAR_SMC, WDT_TH_INT_MASK, 0, 0, 0, 0, 0, 0, &res); > - dev_crit(wdt->wdd.parent, "Intel Keem Bay non-sec wdt pre-timeout.\n"); > + dev_crit(wdt->wdd.parent, "Intel Keem Bay non-secure wdt pre-timeout.\n"); > watchdog_notify_pretimeout(&wdt->wdd); > > return IRQ_HANDLED; > @@ -278,8 +281,8 @@ static const struct of_device_id keembay_wdt_match[] = { > MODULE_DEVICE_TABLE(of, keembay_wdt_match); > > static struct platform_driver keembay_wdt_driver = { > - .probe = keembay_wdt_probe, > - .driver = { > + .probe = keembay_wdt_probe, > + .driver = { > .name = "keembay_wdt", > .of_match_table = keembay_wdt_match, > .pm = &keembay_wdt_pm_ops, > -- > 2.17.1 >
diff --git a/drivers/watchdog/keembay_wdt.c b/drivers/watchdog/keembay_wdt.c index 0a8cf5b35699..6a2699021263 100644 --- a/drivers/watchdog/keembay_wdt.c +++ b/drivers/watchdog/keembay_wdt.c @@ -26,11 +26,14 @@ #define WDT_TH_INT_MASK BIT(8) #define WDT_TO_INT_MASK BIT(9) #define WDT_INT_CLEAR_SMC 0x8200ff18 + #define WDT_UNLOCK 0xf1d0dead #define WDT_DISABLE 0x0 #define WDT_ENABLE 0x1 + #define WDT_LOAD_MAX U32_MAX #define WDT_LOAD_MIN 1 + #define WDT_TIMEOUT 5 #define WDT_PRETIMEOUT 4 @@ -144,7 +147,7 @@ static irqreturn_t keembay_wdt_to_isr(int irq, void *dev_id) struct arm_smccc_res res; arm_smccc_smc(WDT_INT_CLEAR_SMC, WDT_TO_INT_MASK, 0, 0, 0, 0, 0, 0, &res); - dev_crit(wdt->wdd.parent, "Intel Keem Bay non-sec wdt timeout.\n"); + dev_crit(wdt->wdd.parent, "Intel Keem Bay non-secure wdt timeout.\n"); emergency_restart(); return IRQ_HANDLED; @@ -158,7 +161,7 @@ static irqreturn_t keembay_wdt_th_isr(int irq, void *dev_id) keembay_wdt_set_pretimeout(&wdt->wdd, 0x0); arm_smccc_smc(WDT_INT_CLEAR_SMC, WDT_TH_INT_MASK, 0, 0, 0, 0, 0, 0, &res); - dev_crit(wdt->wdd.parent, "Intel Keem Bay non-sec wdt pre-timeout.\n"); + dev_crit(wdt->wdd.parent, "Intel Keem Bay non-secure wdt pre-timeout.\n"); watchdog_notify_pretimeout(&wdt->wdd); return IRQ_HANDLED; @@ -278,8 +281,8 @@ static const struct of_device_id keembay_wdt_match[] = { MODULE_DEVICE_TABLE(of, keembay_wdt_match); static struct platform_driver keembay_wdt_driver = { - .probe = keembay_wdt_probe, - .driver = { + .probe = keembay_wdt_probe, + .driver = { .name = "keembay_wdt", .of_match_table = keembay_wdt_match, .pm = &keembay_wdt_pm_ops,