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

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 <noltari@gmail.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 252aa7b6b6310306dd657fcdb719f2385b436fc8..6722e18bc39c035e8fe6eac593c2f039030edeef 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -690,6 +690,7 @@
                dev@0,0 {
                        compatible = "denx,u-boot-fdt-dummy";
                        reg = <0 0x0 0x1000>;
+                       reg-names = "sandbox-dummy-0";
                };
 
                dev@1,100 {

diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index bfd9580050ca293ff5685b3e68bbca54858cee32..e113f1dd39c7cb0263e94fdaf9271303ceac8e69 100644 (file)
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -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);

diff --git a/drivers/core/read.c b/drivers/core/read.c
index 96766c7876a57eda94086d6d575ae876d03c0c87..cdd78be03e22280f1e0e877befd1556249e1e02b 100644 (file)
--- a/drivers/core/read.c
+++ b/drivers/core/read.c
@@ -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);

diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h
index 49a6ffd5f8325162decedb75435e3682033feb4b..c171d9bc2f42898aa02795280102f3e654132243 100644 (file)
--- a/include/dm/fdtaddr.h
+++ b/include/dm/fdtaddr.h
@@ -55,6 +55,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

diff --git a/include/dm/read.h b/include/dm/read.h
index a27b8554fb1c7808cf323470c5507bd07795b01d..efcbee15ecaea90c05d6d80dcfb75f3a34a3b43a 100644 (file)
--- a/include/dm/read.h
+++ b/include/dm/read.h
@@ -124,6 +124,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
  *
@@ -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)

diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 0fbd9be765a19d6e9e349db6d2e94b07260bf248..96d2528accbd9f88ad2564c2f502c5aad5f3dc3a 100644 (file)
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -490,7 +490,6 @@ static int dm_test_fdt_translation(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_fdt_translation, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
 
-/* Test devfdt_remap_addr_index() */
 static int dm_test_fdt_remap_addr_flat(struct unit_test_state *uts)
 {
        struct udevice *dev;
@@ -511,7 +510,46 @@ static int dm_test_fdt_remap_addr_flat(struct unit_test_state *uts)
 DM_TEST(dm_test_fdt_remap_addr_flat,
        DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_FLAT_TREE);
 
-/* Test dev_remap_addr_index() */
+static int dm_test_fdt_remap_addr_index_flat(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+       fdt_addr_t addr;
+       void *paddr;
+
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev));
+
+       addr = devfdt_get_addr_index(dev, 0);
+       ut_asserteq(0x8000, addr);
+
+       paddr = map_physmem(addr, 0, MAP_NOCACHE);
+       ut_assertnonnull(paddr);
+       ut_asserteq_ptr(paddr, devfdt_remap_addr_index(dev, 0));
+
+       return 0;
+}
+DM_TEST(dm_test_fdt_remap_addr_index_flat,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_FLAT_TREE);
+
+static int dm_test_fdt_remap_addr_name_flat(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+       fdt_addr_t addr;
+       void *paddr;
+
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev));
+
+       addr = devfdt_get_addr_name(dev, "sandbox-dummy-0");
+       ut_asserteq(0x8000, addr);
+
+       paddr = map_physmem(addr, 0, MAP_NOCACHE);
+       ut_assertnonnull(paddr);
+       ut_asserteq_ptr(paddr, devfdt_remap_addr_name(dev, "sandbox-dummy-0"));
+
+       return 0;
+}
+DM_TEST(dm_test_fdt_remap_addr_name_flat,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_FLAT_TREE);
+
 static int dm_test_fdt_remap_addr_live(struct unit_test_state *uts)
 {
        struct udevice *dev;
@@ -532,6 +570,46 @@ static int dm_test_fdt_remap_addr_live(struct unit_test_state *uts)
 DM_TEST(dm_test_fdt_remap_addr_live,
        DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
 
+static int dm_test_fdt_remap_addr_index_live(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+       fdt_addr_t addr;
+       void *paddr;
+
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev));
+
+       addr = dev_read_addr_index(dev, 0);
+       ut_asserteq(0x8000, addr);
+
+       paddr = map_physmem(addr, 0, MAP_NOCACHE);
+       ut_assertnonnull(paddr);
+       ut_asserteq_ptr(paddr, dev_remap_addr_index(dev, 0));
+
+       return 0;
+}
+DM_TEST(dm_test_fdt_remap_addr_index_live,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+
+static int dm_test_fdt_remap_addr_name_live(struct unit_test_state *uts)
+{
+       struct udevice *dev;
+       fdt_addr_t addr;
+       void *paddr;
+
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev));
+
+       addr = dev_read_addr_name(dev, "sandbox-dummy-0");
+       ut_asserteq(0x8000, addr);
+
+       paddr = map_physmem(addr, 0, MAP_NOCACHE);
+       ut_assertnonnull(paddr);
+       ut_asserteq_ptr(paddr, dev_remap_addr_name(dev, "sandbox-dummy-0"));
+
+       return 0;
+}
+DM_TEST(dm_test_fdt_remap_addr_name_live,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+
 static int dm_test_fdt_livetree_writing(struct unit_test_state *uts)
 {
        struct udevice *dev;