| Message ID | 1531205452-6086-2-git-send-email-j-keerthy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 10, 2018 at 12:20:49PM +0530, Keerthy wrote: > Cut down the shutdown time from 2 seconds to 1 sec. In case of roll > over try again. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > --- > drivers/rtc/rtc-omap.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c > index 323ff55..14f2241 100644 > --- a/drivers/rtc/rtc-omap.c > +++ b/drivers/rtc/rtc-omap.c > @@ -441,11 +441,12 @@ static void omap_rtc_power_off(void) > val = rtc_readl(rtc, OMAP_RTC_PMIC_REG); > rtc_writel(rtc, OMAP_RTC_PMIC_REG, val | OMAP_RTC_PMIC_POWER_EN_EN); > > - /* set alarm two seconds from now */ > +again: > + /* set alarm one second from now */ > omap_rtc_read_time_raw(rtc, &tm); > bcd2tm(&tm); > rtc_tm_to_time(&tm, &now); > - rtc_time_to_tm(now + 2, &tm); > + rtc_time_to_tm(now + 1, &tm); > > if (tm2bcd(&tm) < 0) { > dev_err(&rtc->rtc->dev, "power off failed\n"); > @@ -455,6 +456,10 @@ static void omap_rtc_power_off(void) > > rtc_wait_not_busy(rtc); > > + /* Our calculations started right before the rollover, try again */ > + if (seconds != rtc_read(omap_rtc_power_off_rtc, OMAP_RTC_SECONDS_REG)) > + goto again; First, this doesn't even compile. Second, nothing is preventing the rollover from happening here after the check. > + > rtc_write(rtc, OMAP_RTC_ALARM2_SECONDS_REG, tm.tm_sec); > rtc_write(rtc, OMAP_RTC_ALARM2_MINUTES_REG, tm.tm_min); > rtc_write(rtc, OMAP_RTC_ALARM2_HOURS_REG, tm.tm_hour); Johan -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 7/11/2018 7:24 PM, Johan Hovold wrote: > On Tue, Jul 10, 2018 at 12:20:49PM +0530, Keerthy wrote: >> Cut down the shutdown time from 2 seconds to 1 sec. In case of roll >> over try again. >> >> Signed-off-by: Keerthy <j-keerthy@ti.com> >> --- >> drivers/rtc/rtc-omap.c | 9 +++++++-- >> 1 file changed, 7 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c >> index 323ff55..14f2241 100644 >> --- a/drivers/rtc/rtc-omap.c >> +++ b/drivers/rtc/rtc-omap.c >> @@ -441,11 +441,12 @@ static void omap_rtc_power_off(void) >> val = rtc_readl(rtc, OMAP_RTC_PMIC_REG); >> rtc_writel(rtc, OMAP_RTC_PMIC_REG, val | OMAP_RTC_PMIC_POWER_EN_EN); >> >> - /* set alarm two seconds from now */ >> +again: >> + /* set alarm one second from now */ >> omap_rtc_read_time_raw(rtc, &tm); >> bcd2tm(&tm); >> rtc_tm_to_time(&tm, &now); >> - rtc_time_to_tm(now + 2, &tm); >> + rtc_time_to_tm(now + 1, &tm); >> >> if (tm2bcd(&tm) < 0) { >> dev_err(&rtc->rtc->dev, "power off failed\n"); >> @@ -455,6 +456,10 @@ static void omap_rtc_power_off(void) >> >> rtc_wait_not_busy(rtc); >> >> + /* Our calculations started right before the rollover, try again */ >> + if (seconds != rtc_read(omap_rtc_power_off_rtc, OMAP_RTC_SECONDS_REG)) >> + goto again; > > First, this doesn't even compile. My bad. seconds got introduced in patch 2 and i did not compile test this one individually. Apologies for that. > > Second, nothing is preventing the rollover from happening here after the > check. Okay. That window cannot be ignored. So 'now + 2' will surely solve that. I will stick to that. > >> + >> rtc_write(rtc, OMAP_RTC_ALARM2_SECONDS_REG, tm.tm_sec); >> rtc_write(rtc, OMAP_RTC_ALARM2_MINUTES_REG, tm.tm_min); >> rtc_write(rtc, OMAP_RTC_ALARM2_HOURS_REG, tm.tm_hour); > > Johan > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 323ff55..14f2241 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -441,11 +441,12 @@ static void omap_rtc_power_off(void) val = rtc_readl(rtc, OMAP_RTC_PMIC_REG); rtc_writel(rtc, OMAP_RTC_PMIC_REG, val | OMAP_RTC_PMIC_POWER_EN_EN); - /* set alarm two seconds from now */ +again: + /* set alarm one second from now */ omap_rtc_read_time_raw(rtc, &tm); bcd2tm(&tm); rtc_tm_to_time(&tm, &now); - rtc_time_to_tm(now + 2, &tm); + rtc_time_to_tm(now + 1, &tm); if (tm2bcd(&tm) < 0) { dev_err(&rtc->rtc->dev, "power off failed\n"); @@ -455,6 +456,10 @@ static void omap_rtc_power_off(void) rtc_wait_not_busy(rtc); + /* Our calculations started right before the rollover, try again */ + if (seconds != rtc_read(omap_rtc_power_off_rtc, OMAP_RTC_SECONDS_REG)) + goto again; + rtc_write(rtc, OMAP_RTC_ALARM2_SECONDS_REG, tm.tm_sec); rtc_write(rtc, OMAP_RTC_ALARM2_MINUTES_REG, tm.tm_min); rtc_write(rtc, OMAP_RTC_ALARM2_HOURS_REG, tm.tm_hour);
Cut down the shutdown time from 2 seconds to 1 sec. In case of roll over try again. Signed-off-by: Keerthy <j-keerthy@ti.com> --- drivers/rtc/rtc-omap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)