rtc: pcf85363/pcf85263: fix error that failed to run hwclock -w
diff mbox series

Message ID 20190814093249.40065-1-biwen.li@nxp.com
State New
Headers show
Series
  • rtc: pcf85363/pcf85263: fix error that failed to run hwclock -w
Related show

Commit Message

Biwen Li Aug. 14, 2019, 9:32 a.m. UTC
Issue:
    # hwclock -w
    hwclock: RTC_SET_TIME: Invalid argument

The patch fixes error when run command hwclock -w
with rtc pcf85363/pcf85263

Signed-off-by: Biwen Li <biwen.li@nxp.com>
---
 drivers/rtc/rtc-pcf85363.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Alexandre Belloni Aug. 14, 2019, 10:09 a.m. UTC | #1
Hi,

On 14/08/2019 17:32:49+0800, Biwen Li wrote:
> Issue:
>     # hwclock -w
>     hwclock: RTC_SET_TIME: Invalid argument
> 
> The patch fixes error when run command hwclock -w
> with rtc pcf85363/pcf85263
> 

Could you describe a bit more the issue and what causes it?

IIRC I wrote that code and it works on my pcf85363.

> Signed-off-by: Biwen Li <biwen.li@nxp.com>
> ---
>  drivers/rtc/rtc-pcf85363.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c
> index a075e77617dc..3450d615974d 100644
> --- a/drivers/rtc/rtc-pcf85363.c
> +++ b/drivers/rtc/rtc-pcf85363.c
> @@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct device *dev, struct rtc_time *tm)
>  	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
>  
>  	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
> -				tmp, sizeof(tmp));
> +				tmp, 2);
> +	if (ret)
> +		return ret;
> +
> +	ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
> +				buf, sizeof(tmp) - 2);
>  	if (ret)
>  		return ret;
>  
> -- 
> 2.17.1
>
Li Yang Aug. 14, 2019, 6:39 p.m. UTC | #2
> -----Original Message-----
> From: Biwen Li <biwen.li@nxp.com>
> Sent: Wednesday, August 14, 2019 4:33 AM
> To: a.zummo@towertech.it; alexandre.belloni@bootlin.com; Leo Li
> <leoyang.li@nxp.com>
> Cc: linux-rtc@vger.kernel.org; linux-kernel@vger.kernel.org; Biwen Li
> <biwen.li@nxp.com>
> Subject: rtc: pcf85363/pcf85263: fix error that failed to run hwclock -w
> 
> Issue:
>     # hwclock -w
>     hwclock: RTC_SET_TIME: Invalid argument
> 
> The patch fixes error when run command hwclock -w
> with rtc pcf85363/pcf85263

Can you explain a little bit more in the commit message on how the changes fix the above issue?   It is not that clear just from the code.

> 
> Signed-off-by: Biwen Li <biwen.li@nxp.com>
> ---
>  drivers/rtc/rtc-pcf85363.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c
> index a075e77617dc..3450d615974d 100644
> --- a/drivers/rtc/rtc-pcf85363.c
> +++ b/drivers/rtc/rtc-pcf85363.c
> @@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct device *dev,
> struct rtc_time *tm)
>  	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
> 
>  	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
> -				tmp, sizeof(tmp));
> +				tmp, 2);
> +	if (ret)
> +		return ret;
> +
> +	ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
> +				buf, sizeof(tmp) - 2);
>  	if (ret)
>  		return ret;
> 
> --
> 2.17.1
Biwen Li Aug. 15, 2019, 4:14 a.m. UTC | #3
> > Subject: rtc: pcf85363/pcf85263: fix error that failed to run hwclock
> > -w
> >
> > Issue:
> >     # hwclock -w
> >     hwclock: RTC_SET_TIME: Invalid argument
> >
> > The patch fixes error when run command hwclock -w with rtc
> > pcf85363/pcf85263
> 
> Can you explain a little bit more in the commit message on how the changes fix
> the above issue?   It is not that clear just from the code.
1. Relative patch: https://lkml.org/lkml/2019/4/3/55 , this patch will always
check for unwritable registers, it will compare reg with max_register in regmap_writeable.

2. In drivers/rtc/rtc-pcf85363.c, CTRL_STOP_EN is 0x2e, but DT_100THS is 0, max_regiter is 0x2f,
then reg will be equal to 0x30, '0x30 < 0x2f' is false,so regmap_writeable will return false.

> 
> >
> > Signed-off-by: Biwen Li <biwen.li@nxp.com>
> > ---
> >  drivers/rtc/rtc-pcf85363.c | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c
> > index a075e77617dc..3450d615974d 100644
> > --- a/drivers/rtc/rtc-pcf85363.c
> > +++ b/drivers/rtc/rtc-pcf85363.c
> > @@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct device
> > *dev, struct rtc_time *tm)
> >  	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
> >
> >  	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
> > -				tmp, sizeof(tmp));
> > +				tmp, 2);
> > +	if (ret)
> > +		return ret;
> > +
> > +	ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
> > +				buf, sizeof(tmp) - 2);
> >  	if (ret)
> >  		return ret;
> >
> > --
> > 2.17.1
Biwen Li Aug. 15, 2019, 4:20 a.m. UTC | #4
> Caution: EXT Email
> 
> Hi,
> 
> On 14/08/2019 17:32:49+0800, Biwen Li wrote:
> > Issue:
> >     # hwclock -w
> >     hwclock: RTC_SET_TIME: Invalid argument
> >
> > The patch fixes error when run command hwclock -w with rtc
> > pcf85363/pcf85263
> >
> 
> Could you describe a bit more the issue and what causes it?
1. Relative patch: https://lkml.org/lkml/2019/4/3/55 , this patch will always check for unwritable registers, it will compare reg with max_register in regmap_writeable.

2. In drivers/rtc/rtc-pcf85363.c, CTRL_STOP_EN is 0x2e, but DT_100THS is 0, max_regiter is 0x2f, then reg will be equal to 0x30, '0x30 < 0x2f' is false,so regmap_writeable will return false.
> 
> IIRC I wrote that code and it works on my pcf85363.
> 
> > Signed-off-by: Biwen Li <biwen.li@nxp.com>
> > ---
> >  drivers/rtc/rtc-pcf85363.c | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c
> > index a075e77617dc..3450d615974d 100644
> > --- a/drivers/rtc/rtc-pcf85363.c
> > +++ b/drivers/rtc/rtc-pcf85363.c
> > @@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct device *dev,
> struct rtc_time *tm)
> >       buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
> >
> >       ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
> > -                             tmp, sizeof(tmp));
> > +                             tmp, 2);
> > +     if (ret)
> > +             return ret;
> > +
> > +     ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
> > +                             buf, sizeof(tmp) - 2);
> >       if (ret)
> >               return ret;
> >
> > --
> > 2.17.1
> >
> 
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.
> com&amp;data=02%7C01%7Cbiwen.li%40nxp.com%7C8ef8fda7d05a48ef707
> 308d7209f8029%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C63
> 7013741730886353&amp;sdata=ePC651YZUzvL5ocjXAZqKT0tIZpJM01LgRNSa
> 7i7wLE%3D&amp;reserved=0
Li Yang Aug. 15, 2019, 6:01 p.m. UTC | #5
> -----Original Message-----
> From: Biwen Li
> Sent: Wednesday, August 14, 2019 11:15 PM
> To: Leo Li <leoyang.li@nxp.com>; a.zummo@towertech.it;
> alexandre.belloni@bootlin.com
> Cc: linux-rtc@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: RE: rtc: pcf85363/pcf85263: fix error that failed to run hwclock -w
> 
> > > Subject: rtc: pcf85363/pcf85263: fix error that failed to run
> > > hwclock -w
> > >
> > > Issue:
> > >     # hwclock -w
> > >     hwclock: RTC_SET_TIME: Invalid argument
> > >
> > > The patch fixes error when run command hwclock -w with rtc
> > > pcf85363/pcf85263
> >
> > Can you explain a little bit more in the commit message on how the
> changes fix
> > the above issue?   It is not that clear just from the code.
> 1. Relative patch: https://lkml.org/lkml/2019/4/3/55 , this patch will always
> check for unwritable registers, it will compare reg with max_register in
> regmap_writeable.
> 
> 2. In drivers/rtc/rtc-pcf85363.c, CTRL_STOP_EN is 0x2e, but DT_100THS is 0,
> max_regiter is 0x2f, then reg will be equal to 0x30, '0x30 < 0x2f' is false,so
> regmap_writeable will return false.

From you description, it looks like the problem is actually that the buf[] was written to a wrong place.  If that's the case, we should say that in the commit message.

> 
> >
> > >
> > > Signed-off-by: Biwen Li <biwen.li@nxp.com>
> > > ---
> > >  drivers/rtc/rtc-pcf85363.c | 7 ++++++-
> > >  1 file changed, 6 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c
> > > index a075e77617dc..3450d615974d 100644
> > > --- a/drivers/rtc/rtc-pcf85363.c
> > > +++ b/drivers/rtc/rtc-pcf85363.c
> > > @@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct device
> > > *dev, struct rtc_time *tm)
> > >  	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
> > >
> > >  	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
> > > -				tmp, sizeof(tmp));
> > > +				tmp, 2);
> > > +	if (ret)
> > > +		return ret;
> > > +
> > > +	ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
> > > +				buf, sizeof(tmp) - 2);
> > >  	if (ret)
> > >  		return ret;
> > >
> > > --
> > > 2.17.1
Biwen Li Aug. 16, 2019, 2:40 a.m. UTC | #6
> > > > Subject: rtc: pcf85363/pcf85263: fix error that failed to run
> > > > hwclock -w
> > > >
> > > > Issue:
> > > >     # hwclock -w
> > > >     hwclock: RTC_SET_TIME: Invalid argument
> > > >
> > > > The patch fixes error when run command hwclock -w with rtc
> > > > pcf85363/pcf85263
> > >
> > > Can you explain a little bit more in the commit message on how the
> > changes fix
> > > the above issue?   It is not that clear just from the code.
> > 1. Relative patch: https://lkml.org/lkml/2019/4/3/55 , this patch will
> > always check for unwritable registers, it will compare reg with
> > max_register in regmap_writeable.
> >
> > 2. In drivers/rtc/rtc-pcf85363.c, CTRL_STOP_EN is 0x2e, but DT_100THS
> > is 0, max_regiter is 0x2f, then reg will be equal to 0x30, '0x30 <
> > 0x2f' is false,so regmap_writeable will return false.
> 
> From you description, it looks like the problem is actually that the buf[] was
> written to a wrong place.  If that's the case, we should say that in the commit
> message.
Yes, you are right, I will add this into commit message in v2. Thanks.
> 
> >
> > >
> > > >
> > > > Signed-off-by: Biwen Li <biwen.li@nxp.com>
> > > > ---
> > > >  drivers/rtc/rtc-pcf85363.c | 7 ++++++-
> > > >  1 file changed, 6 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/rtc/rtc-pcf85363.c
> > > > b/drivers/rtc/rtc-pcf85363.c index a075e77617dc..3450d615974d
> > > > 100644
> > > > --- a/drivers/rtc/rtc-pcf85363.c
> > > > +++ b/drivers/rtc/rtc-pcf85363.c
> > > > @@ -166,7 +166,12 @@ static int pcf85363_rtc_set_time(struct
> > > > device *dev, struct rtc_time *tm)
> > > >  	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
> > > >
> > > >  	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
> > > > -				tmp, sizeof(tmp));
> > > > +				tmp, 2);
> > > > +	if (ret)
> > > > +		return ret;
> > > > +
> > > > +	ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
> > > > +				buf, sizeof(tmp) - 2);
> > > >  	if (ret)
> > > >  		return ret;
> > > >
> > > > --
> > > > 2.17.1

Patch
diff mbox series

diff --git a/drivers/rtc/rtc-pcf85363.c b/drivers/rtc/rtc-pcf85363.c
index a075e77617dc..3450d615974d 100644
--- a/drivers/rtc/rtc-pcf85363.c
+++ b/drivers/rtc/rtc-pcf85363.c
@@ -166,7 +166,12 @@  static int pcf85363_rtc_set_time(struct device *dev, struct rtc_time *tm)
 	buf[DT_YEARS] = bin2bcd(tm->tm_year % 100);
 
 	ret = regmap_bulk_write(pcf85363->regmap, CTRL_STOP_EN,
-				tmp, sizeof(tmp));
+				tmp, 2);
+	if (ret)
+		return ret;
+
+	ret = regmap_bulk_write(pcf85363->regmap, DT_100THS,
+				buf, sizeof(tmp) - 2);
 	if (ret)
 		return ret;