[U-Boot,1/2] dm: core: Add functions to read 64-bit dt properties
diff mbox series

Message ID 368e44e98c5bb53e6f20843cf59e6c15e324d78e.1566472608.git.michal.simek@xilinx.com
State Superseded
Delegated to: Peng Fan
Headers show
Series
  • Add sdhci dt caps & caps mask support
Related show

Commit Message

Michal Simek Aug. 22, 2019, 11:16 a.m. UTC
From: T Karthik Reddy <t.karthik.reddy@xilinx.com>

This patch adds functions dev_read_u64_default & dev_read_u64
to read unsigned 64-bit values from devicetree.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 drivers/core/ofnode.c |  2 +-
 drivers/core/read.c   | 10 ++++++++++
 include/dm/ofnode.h   |  2 +-
 include/dm/read.h     | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

Comments

Bin Meng Aug. 23, 2019, 3:27 a.m. UTC | #1
Hi Michal,

On Thu, Aug 22, 2019 at 7:18 PM Michal Simek <michal.simek@xilinx.com> wrote:
>
> From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
>
> This patch adds functions dev_read_u64_default & dev_read_u64
> to read unsigned 64-bit values from devicetree.
>
> Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  drivers/core/ofnode.c |  2 +-
>  drivers/core/read.c   | 10 ++++++++++
>  include/dm/ofnode.h   |  2 +-
>  include/dm/read.h     | 32 ++++++++++++++++++++++++++++++++
>  4 files changed, 44 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
> index e74a662d1d30..7eca00cd6613 100644
> --- a/drivers/core/ofnode.c
> +++ b/drivers/core/ofnode.c
> @@ -79,7 +79,7 @@ int ofnode_read_u64(ofnode node, const char *propname, u64 *outp)
>         return 0;
>  }
>
> -int ofnode_read_u64_default(ofnode node, const char *propname, u64 def)
> +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def)

Why changing the return value type here?

>  {
>         assert(ofnode_valid(node));
>         ofnode_read_u64(node, propname, &def);
> diff --git a/drivers/core/read.c b/drivers/core/read.c
> index 8b5502de1159..5dd2ddca70e8 100644
> --- a/drivers/core/read.c
> +++ b/drivers/core/read.c
> @@ -11,6 +11,16 @@
>  #include <mapmem.h>
>  #include <dm/of_access.h>
>
> +int dev_read_u64(struct udevice *dev, const char *propname, u64 *outp)
> +{
> +       return ofnode_read_u64(dev_ofnode(dev), propname, outp);
> +}
> +
> +u64 dev_read_u64_default(struct udevice *dev, const char *propname, u64 def)
> +{
> +       return ofnode_read_u64_default(dev_ofnode(dev), propname, def);
> +}
> +

I would put the dev_read_u64_* routines after the u32 version below.

>  int dev_read_u32(struct udevice *dev, const char *propname, u32 *outp)
>  {
>         return ofnode_read_u32(dev_ofnode(dev), propname, outp);
> diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
> index 4f89db44c19e..5c4cbf099869 100644
> --- a/include/dm/ofnode.h
> +++ b/include/dm/ofnode.h
> @@ -254,7 +254,7 @@ int ofnode_read_u64(ofnode node, const char *propname, u64 *outp);
>   * @def:       default value to return if the property has no value
>   * @return property value, or @def if not found
>   */
> -int ofnode_read_u64_default(ofnode node, const char *propname, u64 def);
> +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def);
>
>  /**
>   * ofnode_read_string() - Read a string from a property
> diff --git a/include/dm/read.h b/include/dm/read.h
> index 0c62d62f1148..8985f248c68f 100644
> --- a/include/dm/read.h
> +++ b/include/dm/read.h
> @@ -44,6 +44,26 @@ static inline bool dev_of_valid(struct udevice *dev)
>  }
>
>  #ifndef CONFIG_DM_DEV_READ_INLINE
> +/**
> + * dev_read_u64() - read a 64-bit integer from a device's DT property
> + *
> + * @dev:        device to read DT property from
> + * @propname:   name of the property to read from
> + * @outp:       place to put value (if found)
> + * @return 0 if OK, -ve on error
> + */
> +int dev_read_u64(struct udevice *dev, const char *propname, u64 *outp);
> +
> +/**
> + * dev_read_u64_default() - read a 64-bit integer from a device's DT property
> + *
> + * @dev:        device to read DT property from
> + * @propname:   name of the property to read from
> + * @def:        default value to return if the property has no value
> + * @return property value, or @def if not found
> + */
> +u64 dev_read_u64_default(struct udevice *dev, const char *propname, u64 def);
> +
>  /**
>   * dev_read_u32() - read a 32-bit integer from a device's DT property
>   *
> @@ -563,6 +583,18 @@ int dev_read_alias_highest_id(const char *stem);
>
>  #else /* CONFIG_DM_DEV_READ_INLINE is enabled */
>
> +static inline int dev_read_u64(struct udevice *dev,
> +                              const char *propname, u64 *outp)
> +{
> +       return ofnode_read_u64(dev_ofnode(dev), propname, outp);
> +}
> +
> +static inline u64 dev_read_u64_default(struct udevice *dev,
> +                                      const char *propname, u64 def)
> +{
> +       return ofnode_read_u64_default(dev_ofnode(dev), propname, def);
> +}
> +
>  static inline int dev_read_u32(struct udevice *dev,
>                                const char *propname, u32 *outp)
>  {
> --

Regards,
Bin
T Karthik Reddy Aug. 23, 2019, 3:58 a.m. UTC | #2
Hi Bin Meng,

> -----Original Message-----
> From: Bin Meng <bmeng.cn@gmail.com>
> Sent: Friday, August 23, 2019 8:58 AM
> To: Michal Simek <michals@xilinx.com>
> Cc: U-Boot Mailing List <u-boot@lists.denx.de>; T Karthik Reddy
> <tkarthik@xilinx.com>; git <git@xilinx.com>
> Subject: Re: [U-Boot] [PATCH 1/2] dm: core: Add functions to read 64-bit dt
> properties
> 
> Hi Michal,
> 
> On Thu, Aug 22, 2019 at 7:18 PM Michal Simek <michal.simek@xilinx.com>
> wrote:
> >
> > From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> >
> > This patch adds functions dev_read_u64_default & dev_read_u64 to read
> > unsigned 64-bit values from devicetree.
> >
> > Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> > Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> > ---
> >
> >  drivers/core/ofnode.c |  2 +-
> >  drivers/core/read.c   | 10 ++++++++++
> >  include/dm/ofnode.h   |  2 +-
> >  include/dm/read.h     | 32 ++++++++++++++++++++++++++++++++
> >  4 files changed, 44 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index
> > e74a662d1d30..7eca00cd6613 100644
> > --- a/drivers/core/ofnode.c
> > +++ b/drivers/core/ofnode.c
> > @@ -79,7 +79,7 @@ int ofnode_read_u64(ofnode node, const char
> *propname, u64 *outp)
> >         return 0;
> >  }
> >
> > -int ofnode_read_u64_default(ofnode node, const char *propname, u64
> > def)
> > +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64
> > +def)
> 
> Why changing the return value type here?

Because "ofnode_read_u64_default" will get a 64-bit integer value from DT & that 64-bit value should return instead of 32-bit value.

> 
> >  {
> >         assert(ofnode_valid(node));
> >         ofnode_read_u64(node, propname, &def); diff --git
> > a/drivers/core/read.c b/drivers/core/read.c index
> > 8b5502de1159..5dd2ddca70e8 100644
> > --- a/drivers/core/read.c
> > +++ b/drivers/core/read.c
> > @@ -11,6 +11,16 @@
> >  #include <mapmem.h>
> >  #include <dm/of_access.h>
> >
> > +int dev_read_u64(struct udevice *dev, const char *propname, u64
> > +*outp) {
> > +       return ofnode_read_u64(dev_ofnode(dev), propname, outp); }
> > +
> > +u64 dev_read_u64_default(struct udevice *dev, const char *propname,
> > +u64 def) {
> > +       return ofnode_read_u64_default(dev_ofnode(dev), propname,
> > +def); }
> > +
> 
> I would put the dev_read_u64_* routines after the u32 version below.

It will be modified in V2.

Regards
T karthik
> 
> >  int dev_read_u32(struct udevice *dev, const char *propname, u32
> > *outp)  {
> >         return ofnode_read_u32(dev_ofnode(dev), propname, outp); diff
> > --git a/include/dm/ofnode.h b/include/dm/ofnode.h index
> > 4f89db44c19e..5c4cbf099869 100644
> > --- a/include/dm/ofnode.h
> > +++ b/include/dm/ofnode.h
> > @@ -254,7 +254,7 @@ int ofnode_read_u64(ofnode node, const char
> *propname, u64 *outp);
> >   * @def:       default value to return if the property has no value
> >   * @return property value, or @def if not found
> >   */
> > -int ofnode_read_u64_default(ofnode node, const char *propname, u64
> > def);
> > +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64
> > +def);
> >
> >  /**
> >   * ofnode_read_string() - Read a string from a property diff --git
> > a/include/dm/read.h b/include/dm/read.h index
> > 0c62d62f1148..8985f248c68f 100644
> > --- a/include/dm/read.h
> > +++ b/include/dm/read.h
> > @@ -44,6 +44,26 @@ static inline bool dev_of_valid(struct udevice
> > *dev)  }
> >
> >  #ifndef CONFIG_DM_DEV_READ_INLINE
> > +/**
> > + * dev_read_u64() - read a 64-bit integer from a device's DT property
> > + *
> > + * @dev:        device to read DT property from
> > + * @propname:   name of the property to read from
> > + * @outp:       place to put value (if found)
> > + * @return 0 if OK, -ve on error
> > + */
> > +int dev_read_u64(struct udevice *dev, const char *propname, u64
> > +*outp);
> > +
> > +/**
> > + * dev_read_u64_default() - read a 64-bit integer from a device's DT
> > +property
> > + *
> > + * @dev:        device to read DT property from
> > + * @propname:   name of the property to read from
> > + * @def:        default value to return if the property has no value
> > + * @return property value, or @def if not found  */
> > +u64 dev_read_u64_default(struct udevice *dev, const char *propname,
> > +u64 def);
> > +
> >  /**
> >   * dev_read_u32() - read a 32-bit integer from a device's DT property
> >   *
> > @@ -563,6 +583,18 @@ int dev_read_alias_highest_id(const char *stem);
> >
> >  #else /* CONFIG_DM_DEV_READ_INLINE is enabled */
> >
> > +static inline int dev_read_u64(struct udevice *dev,
> > +                              const char *propname, u64 *outp) {
> > +       return ofnode_read_u64(dev_ofnode(dev), propname, outp); }
> > +
> > +static inline u64 dev_read_u64_default(struct udevice *dev,
> > +                                      const char *propname, u64 def)
> > +{
> > +       return ofnode_read_u64_default(dev_ofnode(dev), propname,
> > +def); }
> > +
> >  static inline int dev_read_u32(struct udevice *dev,
> >                                const char *propname, u32 *outp)  {
> > --
> 
> Regards,
> Bin
Bin Meng Aug. 23, 2019, 5 a.m. UTC | #3
On Fri, Aug 23, 2019 at 11:58 AM T Karthik Reddy <tkarthik@xilinx.com> wrote:
>
> Hi Bin Meng,
>
> > -----Original Message-----
> > From: Bin Meng <bmeng.cn@gmail.com>
> > Sent: Friday, August 23, 2019 8:58 AM
> > To: Michal Simek <michals@xilinx.com>
> > Cc: U-Boot Mailing List <u-boot@lists.denx.de>; T Karthik Reddy
> > <tkarthik@xilinx.com>; git <git@xilinx.com>
> > Subject: Re: [U-Boot] [PATCH 1/2] dm: core: Add functions to read 64-bit dt
> > properties
> >
> > Hi Michal,
> >
> > On Thu, Aug 22, 2019 at 7:18 PM Michal Simek <michal.simek@xilinx.com>
> > wrote:
> > >
> > > From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> > >
> > > This patch adds functions dev_read_u64_default & dev_read_u64 to read
> > > unsigned 64-bit values from devicetree.
> > >
> > > Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> > > Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> > > ---
> > >
> > >  drivers/core/ofnode.c |  2 +-
> > >  drivers/core/read.c   | 10 ++++++++++
> > >  include/dm/ofnode.h   |  2 +-
> > >  include/dm/read.h     | 32 ++++++++++++++++++++++++++++++++
> > >  4 files changed, 44 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index
> > > e74a662d1d30..7eca00cd6613 100644
> > > --- a/drivers/core/ofnode.c
> > > +++ b/drivers/core/ofnode.c
> > > @@ -79,7 +79,7 @@ int ofnode_read_u64(ofnode node, const char
> > *propname, u64 *outp)
> > >         return 0;
> > >  }
> > >
> > > -int ofnode_read_u64_default(ofnode node, const char *propname, u64
> > > def)
> > > +u64 ofnode_read_u64_default(ofnode node, const char *propname, u64
> > > +def)
> >
> > Why changing the return value type here?
>
> Because "ofnode_read_u64_default" will get a 64-bit integer value from DT & that 64-bit value should return instead of 32-bit value.

Somehow I misread the changes was to another API ofnode_read_u64. Yes,
that makes sense!
>
> >
> > >  {
> > >         assert(ofnode_valid(node));
> > >         ofnode_read_u64(node, propname, &def); diff --git
> > > a/drivers/core/read.c b/drivers/core/read.c index
> > > 8b5502de1159..5dd2ddca70e8 100644
> > > --- a/drivers/core/read.c
> > > +++ b/drivers/core/read.c
> > > @@ -11,6 +11,16 @@
> > >  #include <mapmem.h>
> > >  #include <dm/of_access.h>
> > >
> > > +int dev_read_u64(struct udevice *dev, const char *propname, u64
> > > +*outp) {
> > > +       return ofnode_read_u64(dev_ofnode(dev), propname, outp); }
> > > +
> > > +u64 dev_read_u64_default(struct udevice *dev, const char *propname,
> > > +u64 def) {
> > > +       return ofnode_read_u64_default(dev_ofnode(dev), propname,
> > > +def); }
> > > +
> >
> > I would put the dev_read_u64_* routines after the u32 version below.
>
> It will be modified in V2.
>

Regards,
Bin

Patch
diff mbox series

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index e74a662d1d30..7eca00cd6613 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -79,7 +79,7 @@  int ofnode_read_u64(ofnode node, const char *propname, u64 *outp)
 	return 0;
 }
 
-int ofnode_read_u64_default(ofnode node, const char *propname, u64 def)
+u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def)
 {
 	assert(ofnode_valid(node));
 	ofnode_read_u64(node, propname, &def);
diff --git a/drivers/core/read.c b/drivers/core/read.c
index 8b5502de1159..5dd2ddca70e8 100644
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -11,6 +11,16 @@ 
 #include <mapmem.h>
 #include <dm/of_access.h>
 
+int dev_read_u64(struct udevice *dev, const char *propname, u64 *outp)
+{
+	return ofnode_read_u64(dev_ofnode(dev), propname, outp);
+}
+
+u64 dev_read_u64_default(struct udevice *dev, const char *propname, u64 def)
+{
+	return ofnode_read_u64_default(dev_ofnode(dev), propname, def);
+}
+
 int dev_read_u32(struct udevice *dev, const char *propname, u32 *outp)
 {
 	return ofnode_read_u32(dev_ofnode(dev), propname, outp);
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 4f89db44c19e..5c4cbf099869 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -254,7 +254,7 @@  int ofnode_read_u64(ofnode node, const char *propname, u64 *outp);
  * @def:	default value to return if the property has no value
  * @return property value, or @def if not found
  */
-int ofnode_read_u64_default(ofnode node, const char *propname, u64 def);
+u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def);
 
 /**
  * ofnode_read_string() - Read a string from a property
diff --git a/include/dm/read.h b/include/dm/read.h
index 0c62d62f1148..8985f248c68f 100644
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -44,6 +44,26 @@  static inline bool dev_of_valid(struct udevice *dev)
 }
 
 #ifndef CONFIG_DM_DEV_READ_INLINE
+/**
+ * dev_read_u64() - read a 64-bit integer from a device's DT property
+ *
+ * @dev:        device to read DT property from
+ * @propname:   name of the property to read from
+ * @outp:       place to put value (if found)
+ * @return 0 if OK, -ve on error
+ */
+int dev_read_u64(struct udevice *dev, const char *propname, u64 *outp);
+
+/**
+ * dev_read_u64_default() - read a 64-bit integer from a device's DT property
+ *
+ * @dev:        device to read DT property from
+ * @propname:   name of the property to read from
+ * @def:        default value to return if the property has no value
+ * @return property value, or @def if not found
+ */
+u64 dev_read_u64_default(struct udevice *dev, const char *propname, u64 def);
+
 /**
  * dev_read_u32() - read a 32-bit integer from a device's DT property
  *
@@ -563,6 +583,18 @@  int dev_read_alias_highest_id(const char *stem);
 
 #else /* CONFIG_DM_DEV_READ_INLINE is enabled */
 
+static inline int dev_read_u64(struct udevice *dev,
+			       const char *propname, u64 *outp)
+{
+	return ofnode_read_u64(dev_ofnode(dev), propname, outp);
+}
+
+static inline u64 dev_read_u64_default(struct udevice *dev,
+				       const char *propname, u64 def)
+{
+	return ofnode_read_u64_default(dev_ofnode(dev), propname, def);
+}
+
 static inline int dev_read_u32(struct udevice *dev,
 			       const char *propname, u32 *outp)
 {