4 files changed, 24 insertions, 10 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 8368d96ae7b4..b9864806e9b8 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -227,7 +227,8 @@ static int __of_node_add(struct device_node *np)
         np->kobj.kset = of_kset;
         if (!np->parent) {
                 /* Nodes without parents are new top level trees */
-                rc = kobject_add(&np->kobj, NULL, safe_name(&of_kset->kobj, "base"));
+                rc = kobject_add(&np->kobj, NULL, "%s",
+                                 safe_name(&of_kset->kobj, "base"));
         } else {
                 name = safe_name(&np->parent->kobj, kbasename(np->full_name));
                 if (!name || !name[0])
@@ -1960,9 +1961,9 @@ int of_attach_node(struct device_node *np)
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
         np->sibling = np->parent->child;
-        np->allnext = of_allnodes;
+        np->allnext = np->parent->allnext;
+        np->parent->allnext = np;
         np->parent->child = np;
-        of_allnodes = np;
         of_node_clear_flag(np, OF_DETACHED);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c4cddf0cd96d..b777d8f46bd5 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -880,6 +880,21 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
         const u64 phys_offset = __pa(PAGE_OFFSET);
         base &= PAGE_MASK;
         size &= PAGE_MASK;
+
+        if (sizeof(phys_addr_t) < sizeof(u64)) {
+                if (base > ULONG_MAX) {
+                        pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
+                                        base, base + size);
+                        return;
+                }
+
+                if (base + size > ULONG_MAX) {
+                        pr_warning("Ignoring memory range 0x%lx - 0x%llx\n",
+                                        ULONG_MAX, base + size);
+                        size = ULONG_MAX - base;
+                }
+        }
+
         if (base + size < phys_offset) {
                 pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
                            base, base + size);
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index fb4a59830648..a3bf2122a8d5 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -323,11 +323,13 @@ int of_phy_register_fixed_link(struct device_node *np)
         fixed_link_node = of_get_child_by_name(np, "fixed-link");
         if (fixed_link_node) {
                 status.link = 1;
-                status.duplex = of_property_read_bool(np, "full-duplex");
+                status.duplex = of_property_read_bool(fixed_link_node,
+                                                      "full-duplex");
                 if (of_property_read_u32(fixed_link_node, "speed", &status.speed))
                         return -EINVAL;
-                status.pause = of_property_read_bool(np, "pause");
-                status.asym_pause = of_property_read_bool(np, "asym-pause");
+                status.pause = of_property_read_bool(fixed_link_node, "pause");
+                status.asym_pause = of_property_read_bool(fixed_link_node,
+                                                          "asym-pause");
                 of_node_put(fixed_link_node);
                 return fixed_phy_register(PHY_POLL, &status, np);
         }
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 6c48d73a7fd7..500436f9be7f 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -166,10 +166,6 @@ static void of_dma_configure(struct platform_device *pdev)
         int ret;
         struct device *dev = &pdev->dev;
 
-#if defined(CONFIG_MICROBLAZE)
-        pdev->archdata.dma_mask = 0xffffffffUL;
-#endif
-
         /*
          * Set default dma-mask to 32 bit. Drivers are expected to setup
          * the correct supported dma_mask.