[U-Boot] [PATCH v3 044/108] x86: Adjust mrccache_get_region() to support get_mmap()

[Simon Glass]

It is now possible to obtain the memory map for a SPI controllers instead
of having it hard-coded in the device tree. Update the code to support
this.

Signed-off-by: Simon Glass <s...@chromium.org>
---

Changes in v3: None
Changes in v2:
- Use SPI mmap() instead of SPI flash

 arch/x86/lib/mrccache.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c
index b8bc5de602c..b5d1ea11c5b 100644
--- a/arch/x86/lib/mrccache.c
+++ b/arch/x86/lib/mrccache.c
@@ -205,6 +205,9 @@ int mrccache_get_region(struct udevice **devp, struct 
mrc_region *entry)
 {
        struct udevice *dev;
        ofnode mrc_node;
+       ulong map_base;
+       uint map_size;
+       uint offset;
        u32 reg[2];
        int ret;
 
@@ -216,10 +219,15 @@ int mrccache_get_region(struct udevice **devp, struct 
mrc_region *entry)
        ret = uclass_find_first_device(UCLASS_SPI_FLASH, &dev);
        if (ret)
                return log_msg_ret("Cannot find SPI flash\n", ret);
-       ret = dev_read_u32_array(dev, "memory-map", reg, 2);
-       if (ret)
-               return log_msg_ret("Cannot find memory map\n", ret);
-       entry->base = reg[0];
+       ret = dm_spi_get_mmap(dev, &map_base, &map_size, &offset);
+       if (!ret) {
+               entry->base = map_base;
+       } else {
+               ret = dev_read_u32_array(dev, "memory-map", reg, 2);
+               if (ret)
+                       return log_msg_ret("Cannot find memory map\n", ret);
+               entry->base = reg[0];
+       }
 
        /* Find the place where we put the MRC cache */
        mrc_node = dev_read_subnode(dev, "rw-mrc-cache");
@@ -234,6 +242,8 @@ int mrccache_get_region(struct udevice **devp, struct 
mrc_region *entry)
 
        if (devp)
                *devp = dev;
+       debug("MRC cache in '%s', offset %x, len %x, base %x\n",
+             dev->name, entry->offset, entry->length, entry->base);
 
        return 0;
 }
-- 
2.23.0.866.gb869b98d4c-goog

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot