dm: core: add functions to get/remap I/O addresses by name

PATCH Superseded Álvaro Fernández Rojas 4 participants 9 messages Nov 29, 2018 – Dec 5, 2018

lore

Share & tools

lore

Álvaro Fernández Rojas

author

2018-11-29 19:57 UTC #0 lore raw

PATCH 1/1 dm: core: add functions to get/remap I/O addresses by name

Signed-off-by Álvaro Fernández Rojas <[email protected]>

---
 drivers/core/fdtaddr.c | 10 ++++++++++
 drivers/core/read.c    | 20 ++++++++++++++++++++
 include/dm/fdtaddr.h   | 13 +++++++++++++
 include/dm/read.h      | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+)

drivers/core/fdtaddr.c +10 -0

index bfd9580050..e113f1dd39 100644
@@ -146,6 +146,16 @@ void *devfdt_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = devfdt_get_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 void *devfdt_remap_addr(struct udevice *dev)
 {
 	return devfdt_remap_addr_index(dev, 0);

drivers/core/read.c +20 -0

index 96766c7876..cdd78be03e 100644
@@ -69,6 +69,26 @@ void *dev_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char *name)
+{
+	int index = dev_read_stringlist_search(dev, "reg-names", name);
+
+	if (index < 0)
+		return FDT_ADDR_T_NONE;
+	else
+		return dev_read_addr_index(dev, index);
+}
+
+void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = dev_read_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return dev_read_addr_index(dev, 0);

include/dm/fdtaddr.h +13 -0

index 49a6ffd5f8..c171d9bc2f 100644
@@ -56,6 +56,19 @@ void *devfdt_remap_addr(struct udevice *dev);
 void *devfdt_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * devfdt_remap_addr_name() - Get the reg property of a device, indexed by
+ *                            name, as a memory-mapped I/O pointer
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @dev: Pointer to a device
+ *
+ * @return Pointer to addr, or NULL if there is no such property
+ */
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name);
+
+/**
  * devfdt_map_physmem() - Read device address from reg property of the
  *                     device node and map the address into CPU address
  *                     space.

include/dm/read.h +36 -0

index a27b8554fb..efcbee15ec 100644
@@ -125,6 +125,31 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index);
 void *dev_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * dev_read_addr_name() - Get the reg property of a device, indexed by name
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return address or FDT_ADDR_T_NONE if not found
+ */
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char* name);
+
+/**
+ * dev_remap_addr_name() - Get the reg property of a device, indexed by name,
+ *                         as a memory-mapped I/O pointer
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return pointer or NULL if not found
+ */
+void *dev_remap_addr_name(struct udevice *dev, const char* name);
+
+/**
  * dev_read_addr() - Get the reg property of a device
  *
  * @dev: Device to read from

@@ -494,6 +519,12 @@ static inline fdt_addr_t dev_read_addr_index(struct udevice *dev, int index)
 	return devfdt_get_addr_index(dev, index);
 }
 
+static inline fdt_addr_t dev_read_addr_name(struct udevice *dev,
+					    const char *name)
+{
+	return devfdt_get_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return devfdt_get_addr(dev);

@@ -514,6 +545,11 @@ static inline void *dev_remap_addr_index(struct udevice *dev, int index)
 	return devfdt_remap_addr_index(dev, index);
 }
 
+static inline void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	return devfdt_remap_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr_size(struct udevice *dev,
 					    const char *propname,
 					    fdt_size_t *sizep)

Signature · 1 line

2.11.0

Daniel Schwierzeck

2018-11-30 13:29 UTC #1 lore raw

PATCH 1/1 dm: core: add functions to get/remap I/O addresses by name

Am 29.11.18 um 20:57 schrieb Álvaro Fernández Rojas:

Quoted 7 lines

Signed-off-by Álvaro Fernández Rojas <[email protected]>

---
 drivers/core/fdtaddr.c | 10 ++++++++++
 drivers/core/read.c    | 20 ++++++++++++++++++++
 include/dm/fdtaddr.h   | 13 +++++++++++++
 include/dm/read.h      | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 79 insertions(+)

nice, but I guess Simon will insist on some tests in test/dm/test-fdt.c.

You could copy and adapt dm_test_fdt_remap_addr_flat() and dm_test_fdt_remap_addr_live().

Quoted 139 lines

drivers/core/fdtaddr.c +10 -0

index bfd9580050..e113f1dd39 100644
@@ -146,6 +146,16 @@ void *devfdt_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = devfdt_get_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 void *devfdt_remap_addr(struct udevice *dev)
 {
 	return devfdt_remap_addr_index(dev, 0);

drivers/core/read.c +20 -0

index 96766c7876..cdd78be03e 100644
@@ -69,6 +69,26 @@ void *dev_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char *name)
+{
+	int index = dev_read_stringlist_search(dev, "reg-names", name);
+
+	if (index < 0)
+		return FDT_ADDR_T_NONE;
+	else
+		return dev_read_addr_index(dev, index);
+}
+
+void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = dev_read_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return dev_read_addr_index(dev, 0);

include/dm/fdtaddr.h +13 -0

index 49a6ffd5f8..c171d9bc2f 100644
@@ -56,6 +56,19 @@ void *devfdt_remap_addr(struct udevice *dev);
 void *devfdt_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * devfdt_remap_addr_name() - Get the reg property of a device, indexed by
+ *                            name, as a memory-mapped I/O pointer
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @dev: Pointer to a device
+ *
+ * @return Pointer to addr, or NULL if there is no such property
+ */
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name);
+
+/**
  * devfdt_map_physmem() - Read device address from reg property of the
  *                     device node and map the address into CPU address
  *                     space.

include/dm/read.h +36 -0

index a27b8554fb..efcbee15ec 100644
@@ -125,6 +125,31 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index);
 void *dev_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * dev_read_addr_name() - Get the reg property of a device, indexed by name
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return address or FDT_ADDR_T_NONE if not found
+ */
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char* name);
+
+/**
+ * dev_remap_addr_name() - Get the reg property of a device, indexed by name,
+ *                         as a memory-mapped I/O pointer
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return pointer or NULL if not found
+ */
+void *dev_remap_addr_name(struct udevice *dev, const char* name);
+
+/**
  * dev_read_addr() - Get the reg property of a device
  *
  * @dev: Device to read from

@@ -494,6 +519,12 @@ static inline fdt_addr_t dev_read_addr_index(struct udevice *dev, int index)
 	return devfdt_get_addr_index(dev, index);
 }
 
+static inline fdt_addr_t dev_read_addr_name(struct udevice *dev,
+					    const char *name)
+{
+	return devfdt_get_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return devfdt_get_addr(dev);

@@ -514,6 +545,11 @@ static inline void *dev_remap_addr_index(struct udevice *dev, int index)
 	return devfdt_remap_addr_index(dev, index);
 }
 
+static inline void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	return devfdt_remap_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr_size(struct udevice *dev,
 					    const char *propname,
 					    fdt_size_t *sizep)

Signature · 9 lines

- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181130/fefbd5df/attachment.sig>

Álvaro Fernández Rojas

author

2018-11-30 17:10 UTC #2 lore raw

PATCH 1/1 dm: core: add functions to get/remap I/O addresses by name

Hi Daniel,

Quoted 9 lines · Daniel Schwierzeck

Am 29.11.18 um 20:57 schrieb Álvaro Fernández Rojas:
Quoted 7 lines
Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
  drivers/core/fdtaddr.c | 10 ++++++++++
  drivers/core/read.c    | 20 ++++++++++++++++++++
  include/dm/fdtaddr.h   | 13 +++++++++++++
  include/dm/read.h      | 36 ++++++++++++++++++++++++++++++++++++
  4 files changed, 79 insertions(+)

Quoted 4 lines

nice, but I guess Simon will insist on some tests in test/dm/test-fdt.c.
You could copy and adapt dm_test_fdt_remap_addr_flat() and dm_test_fdt_remap_addr_live().

Ok, I will send a new version with the suggested test.

Quoted 139 lines

drivers/core/fdtaddr.c +10 -0

index bfd9580050..e113f1dd39 100644
@@ -146,6 +146,16 @@ void *devfdt_remap_addr_index(struct udevice *dev, int index)
  	return map_physmem(addr, 0, MAP_NOCACHE);
  }
 
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = devfdt_get_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
  void *devfdt_remap_addr(struct udevice *dev)
  {
  	return devfdt_remap_addr_index(dev, 0);

drivers/core/read.c +20 -0

index 96766c7876..cdd78be03e 100644
@@ -69,6 +69,26 @@ void *dev_remap_addr_index(struct udevice *dev, int index)
  	return map_physmem(addr, 0, MAP_NOCACHE);
  }
 
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char *name)
+{
+	int index = dev_read_stringlist_search(dev, "reg-names", name);
+
+	if (index < 0)
+		return FDT_ADDR_T_NONE;
+	else
+		return dev_read_addr_index(dev, index);
+}
+
+void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = dev_read_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
  fdt_addr_t dev_read_addr(struct udevice *dev)
  {
  	return dev_read_addr_index(dev, 0);

include/dm/fdtaddr.h +13 -0

index 49a6ffd5f8..c171d9bc2f 100644
@@ -56,6 +56,19 @@ void *devfdt_remap_addr(struct udevice *dev);
  void *devfdt_remap_addr_index(struct udevice *dev, int index);
 
  /**
+ * devfdt_remap_addr_name() - Get the reg property of a device, indexed by
+ *                            name, as a memory-mapped I/O pointer
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @dev: Pointer to a device
+ *
+ * @return Pointer to addr, or NULL if there is no such property
+ */
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name);
+
+/**
   * devfdt_map_physmem() - Read device address from reg property of the
   *                     device node and map the address into CPU address
   *                     space.

include/dm/read.h +36 -0

index a27b8554fb..efcbee15ec 100644
@@ -125,6 +125,31 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index);
  void *dev_remap_addr_index(struct udevice *dev, int index);
 
  /**
+ * dev_read_addr_name() - Get the reg property of a device, indexed by name
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return address or FDT_ADDR_T_NONE if not found
+ */
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char* name);
+
+/**
+ * dev_remap_addr_name() - Get the reg property of a device, indexed by name,
+ *                         as a memory-mapped I/O pointer
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return pointer or NULL if not found
+ */
+void *dev_remap_addr_name(struct udevice *dev, const char* name);
+
+/**
   * dev_read_addr() - Get the reg property of a device
   *
   * @dev: Device to read from

@@ -494,6 +519,12 @@ static inline fdt_addr_t dev_read_addr_index(struct udevice *dev, int index)
  	return devfdt_get_addr_index(dev, index);
  }
 
+static inline fdt_addr_t dev_read_addr_name(struct udevice *dev,
+					    const char *name)
+{
+	return devfdt_get_addr_name(dev, name);
+}
+
  static inline fdt_addr_t dev_read_addr(struct udevice *dev)
  {
  	return devfdt_get_addr(dev);

@@ -514,6 +545,11 @@ static inline void *dev_remap_addr_index(struct udevice *dev, int index)
  	return devfdt_remap_addr_index(dev, index);
  }
 
+static inline void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	return devfdt_remap_addr_name(dev, name);
+}
+
  static inline fdt_addr_t dev_read_addr_size(struct udevice *dev,
  					    const char *propname,
  					    fdt_size_t *sizep)

Álvaro Fernández Rojas

author

2018-12-01 19:31 UTC #3 lore raw

PATCH v2 1/1 dm: core: add functions to get/remap I/O addresses by name

In reply to Álvaro Fernández Rojas

Signed-off-by Álvaro Fernández Rojas <[email protected]>

---
v2: add remap tests

 arch/sandbox/dts/test.dts |  1 +
 drivers/core/fdtaddr.c    | 10 ++++++
 drivers/core/read.c       | 20 ++++++++++++
 include/dm/fdtaddr.h      | 13 ++++++++
 include/dm/read.h         | 36 +++++++++++++++++++++
 test/dm/test-fdt.c        | 82 +++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 160 insertions(+), 2 deletions(-)

arch/sandbox/dts/test.dts +1 -0

index 2c6b422312..df523b0c37 100644
@@ -680,6 +680,7 @@
 		dev at 0,0 {
 			compatible = "denx,u-boot-fdt-dummy";
 			reg = <0 0x0 0x1000>;
+			reg-names = "sandbox-dummy-0";
 		};
 
 		dev at 1,100 {

drivers/core/fdtaddr.c +10 -0

index bfd9580050..e113f1dd39 100644
@@ -146,6 +146,16 @@ void *devfdt_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = devfdt_get_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 void *devfdt_remap_addr(struct udevice *dev)
 {
 	return devfdt_remap_addr_index(dev, 0);

drivers/core/read.c +20 -0

index 96766c7876..cdd78be03e 100644
@@ -69,6 +69,26 @@ void *dev_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char *name)
+{
+	int index = dev_read_stringlist_search(dev, "reg-names", name);
+
+	if (index < 0)
+		return FDT_ADDR_T_NONE;
+	else
+		return dev_read_addr_index(dev, index);
+}
+
+void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = dev_read_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return dev_read_addr_index(dev, 0);

include/dm/fdtaddr.h +13 -0

index 49a6ffd5f8..c171d9bc2f 100644
@@ -56,6 +56,19 @@ void *devfdt_remap_addr(struct udevice *dev);
 void *devfdt_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * devfdt_remap_addr_name() - Get the reg property of a device, indexed by
+ *                            name, as a memory-mapped I/O pointer
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @dev: Pointer to a device
+ *
+ * @return Pointer to addr, or NULL if there is no such property
+ */
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name);
+
+/**
  * devfdt_map_physmem() - Read device address from reg property of the
  *                     device node and map the address into CPU address
  *                     space.

include/dm/read.h +36 -0

index a27b8554fb..efcbee15ec 100644
@@ -125,6 +125,31 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index);
 void *dev_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * dev_read_addr_name() - Get the reg property of a device, indexed by name
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return address or FDT_ADDR_T_NONE if not found
+ */
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char* name);
+
+/**
+ * dev_remap_addr_name() - Get the reg property of a device, indexed by name,
+ *                         as a memory-mapped I/O pointer
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return pointer or NULL if not found
+ */
+void *dev_remap_addr_name(struct udevice *dev, const char* name);
+
+/**
  * dev_read_addr() - Get the reg property of a device
  *
  * @dev: Device to read from

@@ -494,6 +519,12 @@ static inline fdt_addr_t dev_read_addr_index(struct udevice *dev, int index)
 	return devfdt_get_addr_index(dev, index);
 }
 
+static inline fdt_addr_t dev_read_addr_name(struct udevice *dev,
+					    const char *name)
+{
+	return devfdt_get_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return devfdt_get_addr(dev);

@@ -514,6 +545,11 @@ static inline void *dev_remap_addr_index(struct udevice *dev, int index)
 	return devfdt_remap_addr_index(dev, index);
 }
 
+static inline void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	return devfdt_remap_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr_size(struct udevice *dev,
 					    const char *propname,
 					    fdt_size_t *sizep)

test/dm/test-fdt.c +80 -2

100 lines not on this page · raw message

Signature · 1 line

2.11.0

Álvaro Fernández Rojas

author

2018-12-03 18:37 UTC #5 lore raw

PATCH v3 1/1 dm: core: add functions to get/remap I/O addresses by name

In reply to Álvaro Fernández Rojas

This functions allow us to get and remap I/O addresses by name, which is useful when there are multiple reg addresses indexed by reg-names property. This is needed in bmips dma/eth patch series, but can also be used on many
other drivers.

Signed-off-by Álvaro Fernández Rojas <[email protected]>

---
v3: add commit message
v2: add remap tests

 arch/sandbox/dts/test.dts |  1 +
 drivers/core/fdtaddr.c    | 10 ++++++
 drivers/core/read.c       | 20 ++++++++++++
 include/dm/fdtaddr.h      | 13 ++++++++
 include/dm/read.h         | 36 +++++++++++++++++++++
 test/dm/test-fdt.c        | 82 +++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 160 insertions(+), 2 deletions(-)

arch/sandbox/dts/test.dts +1 -0

index 252aa7b6b6..6722e18bc3 100644
@@ -690,6 +690,7 @@
 		dev at 0,0 {
 			compatible = "denx,u-boot-fdt-dummy";
 			reg = <0 0x0 0x1000>;
+			reg-names = "sandbox-dummy-0";
 		};
 
 		dev at 1,100 {

drivers/core/fdtaddr.c +10 -0

index bfd9580050..e113f1dd39 100644
@@ -146,6 +146,16 @@ void *devfdt_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = devfdt_get_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 void *devfdt_remap_addr(struct udevice *dev)
 {
 	return devfdt_remap_addr_index(dev, 0);

drivers/core/read.c +20 -0

index 96766c7876..cdd78be03e 100644
@@ -69,6 +69,26 @@ void *dev_remap_addr_index(struct udevice *dev, int index)
 	return map_physmem(addr, 0, MAP_NOCACHE);
 }
 
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char *name)
+{
+	int index = dev_read_stringlist_search(dev, "reg-names", name);
+
+	if (index < 0)
+		return FDT_ADDR_T_NONE;
+	else
+		return dev_read_addr_index(dev, index);
+}
+
+void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	fdt_addr_t addr = dev_read_addr_name(dev, name);
+
+	if (addr == FDT_ADDR_T_NONE)
+		return NULL;
+
+	return map_physmem(addr, 0, MAP_NOCACHE);
+}
+
 fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return dev_read_addr_index(dev, 0);

include/dm/fdtaddr.h +13 -0

index 49a6ffd5f8..c171d9bc2f 100644
@@ -56,6 +56,19 @@ void *devfdt_remap_addr(struct udevice *dev);
 void *devfdt_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * devfdt_remap_addr_name() - Get the reg property of a device, indexed by
+ *                            name, as a memory-mapped I/O pointer
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @dev: Pointer to a device
+ *
+ * @return Pointer to addr, or NULL if there is no such property
+ */
+void *devfdt_remap_addr_name(struct udevice *dev, const char *name);
+
+/**
  * devfdt_map_physmem() - Read device address from reg property of the
  *                     device node and map the address into CPU address
  *                     space.

include/dm/read.h +36 -0

index a27b8554fb..efcbee15ec 100644
@@ -125,6 +125,31 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index);
 void *dev_remap_addr_index(struct udevice *dev, int index);
 
 /**
+ * dev_read_addr_name() - Get the reg property of a device, indexed by name
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return address or FDT_ADDR_T_NONE if not found
+ */
+fdt_addr_t dev_read_addr_name(struct udevice *dev, const char* name);
+
+/**
+ * dev_remap_addr_name() - Get the reg property of a device, indexed by name,
+ *                         as a memory-mapped I/O pointer
+ *
+ * @dev: Device to read from
+ * @name: the 'reg' property can hold a list of <addr, size> pairs, with the
+ *	  'reg-names' property providing named-based identification. @index
+ *	  indicates the value to search for in 'reg-names'.
+ *
+ * @return pointer or NULL if not found
+ */
+void *dev_remap_addr_name(struct udevice *dev, const char* name);
+
+/**
  * dev_read_addr() - Get the reg property of a device
  *
  * @dev: Device to read from

@@ -494,6 +519,12 @@ static inline fdt_addr_t dev_read_addr_index(struct udevice *dev, int index)
 	return devfdt_get_addr_index(dev, index);
 }
 
+static inline fdt_addr_t dev_read_addr_name(struct udevice *dev,
+					    const char *name)
+{
+	return devfdt_get_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr(struct udevice *dev)
 {
 	return devfdt_get_addr(dev);

@@ -514,6 +545,11 @@ static inline void *dev_remap_addr_index(struct udevice *dev, int index)
 	return devfdt_remap_addr_index(dev, index);
 }
 
+static inline void *dev_remap_addr_name(struct udevice *dev, const char *name)
+{
+	return devfdt_remap_addr_name(dev, name);
+}
+
 static inline fdt_addr_t dev_read_addr_size(struct udevice *dev,
 					    const char *propname,
 					    fdt_size_t *sizep)

test/dm/test-fdt.c +80 -2

100 lines not on this page · raw message

Signature · 1 line

2.11.0

Daniel Schwierzeck

2018-12-03 20:18 UTC #6 lore raw

PATCH v3 1/1 dm: core: add functions to get/remap I/O addresses by name

Am 03.12.18 um 19:37 schrieb Álvaro Fernández Rojas:

Quoted 9 lines

This functions allow us to get and remap I/O addresses by name, which is useful when there are multiple reg addresses indexed by reg-names property. This is needed in bmips dma/eth patch series, but can also be used on many
other drivers.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
v3: add commit message
v2: add remap tests

Quoted 8 lines

 arch/sandbox/dts/test.dts |  1 +
 drivers/core/fdtaddr.c    | 10 ++++++
 drivers/core/read.c       | 20 ++++++++++++
 include/dm/fdtaddr.h      | 13 ++++++++
 include/dm/read.h         | 36 +++++++++++++++++++++
 test/dm/test-fdt.c        | 82 +++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 160 insertions(+), 2 deletions(-)

Reviewed-by Daniel Schwierzeck <[email protected]>

Signature · 1 line

- Daniel

Simon Glass

2018-12-03 23:44 UTC #7 lore raw

PATCH v3 1/1 dm: core: add functions to get/remap I/O addresses by name

In reply to Álvaro Fernández Rojas

Quoted 10 lines · Álvaro Fernández Rojas

This functions allow us to get and remap I/O addresses by name, which is useful when there are multiple reg addresses indexed by reg-names property. This is needed in bmips dma/eth patch series, but can also be used on many
other drivers.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
v3: add commit message
v2: add remap tests

Quoted 7 lines

 arch/sandbox/dts/test.dts |  1 +
 drivers/core/fdtaddr.c    | 10 ++++++
 drivers/core/read.c       | 20 ++++++++++++
 include/dm/fdtaddr.h      | 13 ++++++++
 include/dm/read.h         | 36 +++++++++++++++++++++
 test/dm/test-fdt.c        | 82 +++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 160 insertions(+), 2 deletions(-)

Reviewed-by Simon Glass <[email protected]>

sjg at google.com

2018-12-05 23:10 UTC #8 lore raw

PATCH v3 1/1 dm: core: add functions to get/remap I/O addresses by name

Quoted 10 lines · Álvaro Fernández Rojas

This functions allow us to get and remap I/O addresses by name, which is useful when there are multiple reg addresses indexed by reg-names property. This is needed in bmips dma/eth patch series, but can also be used on many
other drivers.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
---
v3: add commit message
v2: add remap tests

Quoted 7 lines

 arch/sandbox/dts/test.dts |  1 +
 drivers/core/fdtaddr.c    | 10 ++++++
 drivers/core/read.c       | 20 ++++++++++++
 include/dm/fdtaddr.h      | 13 ++++++++
 include/dm/read.h         | 36 +++++++++++++++++++++
 test/dm/test-fdt.c        | 82 +++++++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 160 insertions(+), 2 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Applied to u-boot-dm/master, thanks!