From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Brugger Subject: Re: [PATCH v5 09/10] rtc: mt6397: fix alarm register overwrite Date: Fri, 23 Aug 2019 17:35:19 +0200 Message-ID: References: <1566531931-9772-1-git-send-email-hsin-hsiung.wang@mediatek.com> <1566531931-9772-10-git-send-email-hsin-hsiung.wang@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1566531931-9772-10-git-send-email-hsin-hsiung.wang@mediatek.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Hsin-Hsiung Wang , Lee Jones , Rob Herring , Mark Brown , Alexandre Belloni Cc: Mark Rutland , Liam Girdwood , Eddie Huang , Sean Wang , Alessandro Zummo , Kate Stewart , Greg Kroah-Hartman , Thomas Gleixner , Richard Fontana , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rtc@vger.kernel.org, srv_heupstream@mediatek.com, Ran Bi List-Id: devicetree@vger.kernel.org On 23/08/2019 05:45, Hsin-Hsiung Wang wrote: > From: Ran Bi > > Alarm registers high byte was reserved for other functions. > This add mask in alarm registers operation functions. > This also fix error condition in interrupt handler. > > Fixes: fc2979118f3f ("rtc: mediatek: Add MT6397 RTC driver") > > Acked-by: Alexandre Belloni > Signed-off-by: Ran Bi Misses your Signed-off-by. Regards, Matthias > --- > drivers/rtc/rtc-mt6397.c | 47 +++++++++++++++++++++++++++++++++-------------- > 1 file changed, 33 insertions(+), 14 deletions(-) > > diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c > index b46ed4d..828def7 100644 > --- a/drivers/rtc/rtc-mt6397.c > +++ b/drivers/rtc/rtc-mt6397.c > @@ -47,6 +47,14 @@ > > #define RTC_AL_SEC 0x0018 > > +#define RTC_AL_SEC_MASK 0x003f > +#define RTC_AL_MIN_MASK 0x003f > +#define RTC_AL_HOU_MASK 0x001f > +#define RTC_AL_DOM_MASK 0x001f > +#define RTC_AL_DOW_MASK 0x0007 > +#define RTC_AL_MTH_MASK 0x000f > +#define RTC_AL_YEA_MASK 0x007f > + > #define RTC_PDN2 0x002e > #define RTC_PDN2_PWRON_ALARM BIT(4) > > @@ -103,7 +111,7 @@ static irqreturn_t mtk_rtc_irq_handler_thread(int irq, void *data) > irqen = irqsta & ~RTC_IRQ_EN_AL; > mutex_lock(&rtc->lock); > if (regmap_write(rtc->regmap, rtc->addr_base + RTC_IRQ_EN, > - irqen) < 0) > + irqen) == 0) > mtk_rtc_write_trigger(rtc); > mutex_unlock(&rtc->lock); > > @@ -225,12 +233,12 @@ static int mtk_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) > alm->pending = !!(pdn2 & RTC_PDN2_PWRON_ALARM); > mutex_unlock(&rtc->lock); > > - tm->tm_sec = data[RTC_OFFSET_SEC]; > - tm->tm_min = data[RTC_OFFSET_MIN]; > - tm->tm_hour = data[RTC_OFFSET_HOUR]; > - tm->tm_mday = data[RTC_OFFSET_DOM]; > - tm->tm_mon = data[RTC_OFFSET_MTH]; > - tm->tm_year = data[RTC_OFFSET_YEAR]; > + tm->tm_sec = data[RTC_OFFSET_SEC] & RTC_AL_SEC_MASK; > + tm->tm_min = data[RTC_OFFSET_MIN] & RTC_AL_MIN_MASK; > + tm->tm_hour = data[RTC_OFFSET_HOUR] & RTC_AL_HOU_MASK; > + tm->tm_mday = data[RTC_OFFSET_DOM] & RTC_AL_DOM_MASK; > + tm->tm_mon = data[RTC_OFFSET_MTH] & RTC_AL_MTH_MASK; > + tm->tm_year = data[RTC_OFFSET_YEAR] & RTC_AL_YEA_MASK; > > tm->tm_year += RTC_MIN_YEAR_OFFSET; > tm->tm_mon--; > @@ -251,14 +259,25 @@ static int mtk_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) > tm->tm_year -= RTC_MIN_YEAR_OFFSET; > tm->tm_mon++; > > - data[RTC_OFFSET_SEC] = tm->tm_sec; > - data[RTC_OFFSET_MIN] = tm->tm_min; > - data[RTC_OFFSET_HOUR] = tm->tm_hour; > - data[RTC_OFFSET_DOM] = tm->tm_mday; > - data[RTC_OFFSET_MTH] = tm->tm_mon; > - data[RTC_OFFSET_YEAR] = tm->tm_year; > - > mutex_lock(&rtc->lock); > + ret = regmap_bulk_read(rtc->regmap, rtc->addr_base + RTC_AL_SEC, > + data, RTC_OFFSET_COUNT); > + if (ret < 0) > + goto exit; > + > + data[RTC_OFFSET_SEC] = ((data[RTC_OFFSET_SEC] & ~(RTC_AL_SEC_MASK)) | > + (tm->tm_sec & RTC_AL_SEC_MASK)); > + data[RTC_OFFSET_MIN] = ((data[RTC_OFFSET_MIN] & ~(RTC_AL_MIN_MASK)) | > + (tm->tm_min & RTC_AL_MIN_MASK)); > + data[RTC_OFFSET_HOUR] = ((data[RTC_OFFSET_HOUR] & ~(RTC_AL_HOU_MASK)) | > + (tm->tm_hour & RTC_AL_HOU_MASK)); > + data[RTC_OFFSET_DOM] = ((data[RTC_OFFSET_DOM] & ~(RTC_AL_DOM_MASK)) | > + (tm->tm_mday & RTC_AL_DOM_MASK)); > + data[RTC_OFFSET_MTH] = ((data[RTC_OFFSET_MTH] & ~(RTC_AL_MTH_MASK)) | > + (tm->tm_mon & RTC_AL_MTH_MASK)); > + data[RTC_OFFSET_YEAR] = ((data[RTC_OFFSET_YEAR] & ~(RTC_AL_YEA_MASK)) | > + (tm->tm_year & RTC_AL_YEA_MASK)); > + > if (alm->enabled) { > ret = regmap_bulk_write(rtc->regmap, > rtc->addr_base + RTC_AL_SEC, >