5 files changed, 67 insertions, 25 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index d8574adf0d62..293ed4b687ba 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -138,6 +138,9 @@ int __of_add_property_sysfs(struct device_node *np, struct property *pp)
         /* Important: Don't leak passwords */
         bool secure = strncmp(pp->name, "security-", 9) == 0;
 
+        if (!IS_ENABLED(CONFIG_SYSFS))
+                return 0;
+
         if (!of_kset || !of_node_is_attached(np))
                 return 0;
 
@@ -158,6 +161,9 @@ int __of_attach_node_sysfs(struct device_node *np)
         struct property *pp;
         int rc;
 
+        if (!IS_ENABLED(CONFIG_SYSFS))
+                return 0;
+
         if (!of_kset)
                 return 0;
 
@@ -1713,6 +1719,9 @@ int __of_remove_property(struct device_node *np, struct property *prop)
 
 void __of_remove_property_sysfs(struct device_node *np, struct property *prop)
 {
+        if (!IS_ENABLED(CONFIG_SYSFS))
+                return;
+
         /* at early boot, bail here and defer setup to of_init() */
         if (of_kset && of_node_is_attached(np))
                 sysfs_remove_bin_file(&np->kobj, &prop->attr);
@@ -1777,6 +1786,9 @@ int __of_update_property(struct device_node *np, struct property *newprop,
 void __of_update_property_sysfs(struct device_node *np, struct property *newprop,
                 struct property *oldprop)
 {
+        if (!IS_ENABLED(CONFIG_SYSFS))
+                return;
+
         /* At early boot, bail out and defer setup to of_init() */
         if (!of_kset)
                 return;
@@ -1847,6 +1859,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
 {
         struct property *pp;
 
+        of_aliases = of_find_node_by_path("/aliases");
         of_chosen = of_find_node_by_path("/chosen");
         if (of_chosen == NULL)
                 of_chosen = of_find_node_by_path("/chosen@0");
@@ -1862,7 +1875,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
                         of_stdout = of_find_node_by_path(name);
         }
 
-        of_aliases = of_find_node_by_path("/aliases");
         if (!of_aliases)
                 return;
 
@@ -1986,7 +1998,7 @@ bool of_console_check(struct device_node *dn, char *name, int index)
 {
         if (!dn || dn != of_stdout || console_set_on_cmdline)
                 return false;
-        return add_preferred_console(name, index, NULL);
+        return !add_preferred_console(name, index, NULL);
 }
 EXPORT_SYMBOL_GPL(of_console_check);
 
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 54fecc49a1fe..f297891d8529 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -45,6 +45,9 @@ void __of_detach_node_sysfs(struct device_node *np)
 {
         struct property *pp;
 
+        if (!IS_ENABLED(CONFIG_SYSFS))
+                return;
+
         BUG_ON(!of_node_is_initialized(np));
         if (!of_kset)
                 return;
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index f46a24ffa3fe..d1ffca8b34ea 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -453,7 +453,7 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
                 base = dt_mem_next_cell(dt_root_addr_cells, &prop);
                 size = dt_mem_next_cell(dt_root_size_cells, &prop);
 
-                if (base && size &&
+                if (size &&
                     early_init_dt_reserve_memory_arch(base, size, nomap) == 0)
                         pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %ld MiB\n",
                                 uname, &base, (unsigned long)size / SZ_1M);
@@ -928,7 +928,11 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
 void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
 {
         const u64 phys_offset = __pa(PAGE_OFFSET);
-        base &= PAGE_MASK;
+
+        if (!PAGE_ALIGNED(base)) {
+                size -= PAGE_SIZE - (base & ~PAGE_MASK);
+                base = PAGE_ALIGN(base);
+        }
         size &= PAGE_MASK;
 
         if (base > MAX_PHYS_ADDR) {
@@ -937,10 +941,10 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
                 return;
         }
 
-        if (base + size > MAX_PHYS_ADDR) {
-                pr_warning("Ignoring memory range 0x%lx - 0x%llx\n",
-                                ULONG_MAX, base + size);
-                size = MAX_PHYS_ADDR - base;
+        if (base + size - 1 > MAX_PHYS_ADDR) {
+                pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
+                                ((u64)MAX_PHYS_ADDR) + 1, base + size);
+                size = MAX_PHYS_ADDR - base + 1;
         }
 
         if (base + size < phys_offset) {
diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 3e06a699352d..1471e0a223a5 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -301,16 +301,17 @@ int of_irq_parse_one(struct device_node *device, int index, struct of_phandle_ar
         /* Get the reg property (if any) */
         addr = of_get_property(device, "reg", NULL);
 
+        /* Try the new-style interrupts-extended first */
+        res = of_parse_phandle_with_args(device, "interrupts-extended",
+                                        "#interrupt-cells", index, out_irq);
+        if (!res)
+                return of_irq_parse_raw(addr, out_irq);
+
         /* Get the interrupts property */
         intspec = of_get_property(device, "interrupts", &intlen);
-        if (intspec == NULL) {
-                /* Try the new-style interrupts-extended */
-                res = of_parse_phandle_with_args(device, "interrupts-extended",
-                                                "#interrupt-cells", index, out_irq);
-                if (res)
-                        return -EINVAL;
-                return of_irq_parse_raw(addr, out_irq);
-        }
+        if (intspec == NULL)
+                return -EINVAL;
+
         intlen /= sizeof(*intspec);
 
         pr_debug(" intspec=%d intlen=%d\n", be32_to_cpup(intspec), intlen);
diff --git a/drivers/of/selftest.c b/drivers/of/selftest.c
index d41002667833..a737cb5974de 100644
--- a/drivers/of/selftest.c
+++ b/drivers/of/selftest.c
@@ -27,6 +27,7 @@ static struct selftest_results {
 #define NO_OF_NODES 2
 static struct device_node *nodes[NO_OF_NODES];
 static int last_node_index;
+static bool selftest_live_tree;
 
 #define selftest(result, fmt, ...) { \
         if (!(result)) { \
@@ -630,13 +631,6 @@ static int attach_node_and_children(struct device_node *np)
 {
         struct device_node *next, *root = np, *dup;
 
-        if (!np) {
-                pr_warn("%s: No tree to attach; not running tests\n",
-                        __func__);
-                return -ENODATA;
-        }
-
-
         /* skip root node */
         np = np->child;
         /* storing a copy in temporary node */
@@ -672,12 +666,12 @@ static int attach_node_and_children(struct device_node *np)
 static int __init selftest_data_add(void)
 {
         void *selftest_data;
-        struct device_node *selftest_data_node;
+        struct device_node *selftest_data_node, *np;
         extern uint8_t __dtb_testcases_begin[];
         extern uint8_t __dtb_testcases_end[];
         const int size = __dtb_testcases_end - __dtb_testcases_begin;
 
-        if (!size || !of_allnodes) {
+        if (!size) {
                 pr_warn("%s: No testcase data to attach; not running tests\n",
                         __func__);
                 return -ENODATA;
@@ -692,6 +686,22 @@ static int __init selftest_data_add(void)
                 return -ENOMEM;
         }
         of_fdt_unflatten_tree(selftest_data, &selftest_data_node);
+        if (!selftest_data_node) {
+                pr_warn("%s: No tree to attach; not running tests\n", __func__);
+                return -ENODATA;
+        }
+
+        if (!of_allnodes) {
+                /* enabling flag for removing nodes */
+                selftest_live_tree = true;
+                of_allnodes = selftest_data_node;
+
+                for_each_of_allnodes(np)
+                        __of_attach_node_sysfs(np);
+                of_aliases = of_find_node_by_path("/aliases");
+                of_chosen = of_find_node_by_path("/chosen");
+                return 0;
+        }
 
         /* attach the sub-tree to live tree */
         return attach_node_and_children(selftest_data_node);
@@ -723,6 +733,18 @@ static void selftest_data_remove(void)
         struct device_node *np;
         struct property *prop;
 
+        if (selftest_live_tree) {
+                of_node_put(of_aliases);
+                of_node_put(of_chosen);
+                of_aliases = NULL;
+                of_chosen = NULL;
+                for_each_child_of_node(of_allnodes, np)
+                        detach_node_and_children(np);
+                __of_detach_node_sysfs(of_allnodes);
+                of_allnodes = NULL;
+                return;
+        }
+
         while (last_node_index >= 0) {
                 if (nodes[last_node_index]) {
                         np = of_find_node_by_path(nodes[last_node_index]->full_name);