powerpc: Stop using of_root

Replace all usages of of_root by of_find_node_by_path("/")

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20231214103152.12269-5-mpe@ellerman.id.au

diff --git a/arch/powerpc/kernel/secure_boot.c b/arch/powerpc/kernel/secure_boot.c
index f9af305d9579dc0c359f84cfc3fee9dbd3e1fb80..9e0efb657f3937a3550d7625ba8558e49cdc8a07 100644 (file)
--- a/arch/powerpc/kernel/secure_boot.c
+++ b/arch/powerpc/kernel/secure_boot.c
@@ -32,8 +32,10 @@ bool is_ppc_secureboot_enabled(void)
        if (enabled)
                goto out;
 
-       if (!of_property_read_u32(of_root, "ibm,secure-boot", &secureboot))
+       node = of_find_node_by_path("/");
+       if (!of_property_read_u32(node, "ibm,secure-boot", &secureboot))
                enabled = (secureboot > 1);
+       of_node_put(node);
 
 out:
        pr_info("Secure boot mode %s\n", enabled ? "enabled" : "disabled");
@@ -54,8 +56,10 @@ bool is_ppc_trustedboot_enabled(void)
        if (enabled)
                goto out;
 
-       if (!of_property_read_u32(of_root, "ibm,trusted-boot", &trustedboot))
+       node = of_find_node_by_path("/");
+       if (!of_property_read_u32(node, "ibm,trusted-boot", &trustedboot))
                enabled = (trustedboot > 0);
+       of_node_put(node);
 
 out:
        pr_info("Trusted boot mode %s\n", enabled ? "enabled" : "disabled");

diff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c
index fb3e12f1521441fd9de9c84c3863a719dcb6c62b..33b780049aaf9331e798d9a660d963e583ab1a68 100644 (file)
--- a/arch/powerpc/kexec/ranges.c
+++ b/arch/powerpc/kexec/ranges.c
@@ -385,14 +385,16 @@ int add_opal_mem_range(struct crash_mem **mem_ranges)
 int add_reserved_mem_ranges(struct crash_mem **mem_ranges)
 {
        int n_mem_addr_cells, n_mem_size_cells, i, len, cells, ret = 0;
+       struct device_node *root = of_find_node_by_path("/");
        const __be32 *prop;
 
-       prop = of_get_property(of_root, "reserved-ranges", &len);
+       prop = of_get_property(root, "reserved-ranges", &len);
+       n_mem_addr_cells = of_n_addr_cells(root);
+       n_mem_size_cells = of_n_size_cells(root);
+       of_node_put(root);
        if (!prop)
                return 0;
 
-       n_mem_addr_cells = of_n_addr_cells(of_root);
-       n_mem_size_cells = of_n_size_cells(of_root);
        cells = n_mem_addr_cells + n_mem_size_cells;
 
        /* Each reserved range is an (address,size) pair */

diff --git a/arch/powerpc/mm/drmem.c b/arch/powerpc/mm/drmem.c
index fde7790277f75045576e706909a21e89e4111658..c110ab8fa8a35e8a2ad49b64636a13eca65a1b58 100644 (file)
--- a/arch/powerpc/mm/drmem.c
+++ b/arch/powerpc/mm/drmem.c
@@ -393,17 +393,17 @@ static const __be32 *of_get_usable_memory(struct device_node *dn)
 int walk_drmem_lmbs(struct device_node *dn, void *data,
                    int (*func)(struct drmem_lmb *, const __be32 **, void *))
 {
+       struct device_node *root = of_find_node_by_path("/");
        const __be32 *prop, *usm;
        int ret = -ENODEV;
 
-       if (!of_root)
+       if (!root)
                return ret;
 
        /* Get the address & size cells */
-       of_node_get(of_root);
-       n_root_addr_cells = of_n_addr_cells(of_root);
-       n_root_size_cells = of_n_size_cells(of_root);
-       of_node_put(of_root);
+       n_root_addr_cells = of_n_addr_cells(root);
+       n_root_size_cells = of_n_size_cells(root);
+       of_node_put(root);
 
        if (init_drmem_lmb_size(dn))
                return ret;

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index f6c4ace3b22197e990f47d3124f5ac800459f21d..a490724e84adbf74517bb965e7690657e205fa92 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1111,7 +1111,7 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)
 
 static void __init find_possible_nodes(void)
 {
-       struct device_node *rtas;
+       struct device_node *rtas, *root;
        const __be32 *domains = NULL;
        int prop_length, max_nodes;
        u32 i;
@@ -1132,10 +1132,12 @@ static void __init find_possible_nodes(void)
         * If the LPAR is migratable, new nodes might be activated after a LPM,
         * so we should consider the max number in that case.
         */
-       if (!of_get_property(of_root, "ibm,migratable-partition", NULL))
+       root = of_find_node_by_path("/");
+       if (!of_get_property(root, "ibm,migratable-partition", NULL))
                domains = of_get_property(rtas,
                                          "ibm,current-associativity-domains",
                                          &prop_length);
+       of_node_put(root);
        if (!domains) {
                domains = of_get_property(rtas, "ibm,max-associativity-domains",
                                        &prop_length);

diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index aa82e6b437f31a5c6c9a34c4355660e8e3ced5b8..37a67120f257ca6013d5fce43f2840181ad0a945 100644 (file)
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -195,8 +195,10 @@ static void __init efika_setup_arch(void)
 
 static int __init efika_probe(void)
 {
-       const char *model = of_get_property(of_root, "model", NULL);
+       struct device_node *root = of_find_node_by_path("/");
+       const char *model = of_get_property(root, "model", NULL);
 
+       of_node_put(root);
        if (model == NULL)
                return 0;
        if (strcmp(model, "EFIKA5K2"))

diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index f27d314147373294b6f476980014275edbdaa32c..60f990a336c470224475af73b1ae258d375994bd 100644 (file)
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -270,16 +270,18 @@ static int __init pas_add_bridge(struct device_node *dev)
 
 void __init pas_pci_init(void)
 {
+       struct device_node *root = of_find_node_by_path("/");
        struct device_node *np;
        int res;
 
        pci_set_flags(PCI_SCAN_ALL_PCIE_DEVS);
 
-       np = of_find_compatible_node(of_root, NULL, "pasemi,rootbus");
+       np = of_find_compatible_node(root, NULL, "pasemi,rootbus");
        if (np) {
                res = pas_add_bridge(np);
                of_node_put(np);
        }
+       of_node_put(root);
 }
 
 void __iomem *__init pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)

diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c
index 1c151d77e74b3485593ab586ce15e95dc7fe816f..f73c4d1c26af9822b12fcb9df19f25892933ab38 100644 (file)
--- a/arch/powerpc/platforms/pseries/lparcfg.c
+++ b/arch/powerpc/platforms/pseries/lparcfg.c
@@ -346,9 +346,13 @@ static int read_rtas_lpar_name(struct seq_file *m)
  */
 static int read_dt_lpar_name(struct seq_file *m)
 {
+       struct device_node *root = of_find_node_by_path("/");
        const char *name;
+       int ret;
 
-       if (of_property_read_string(of_root, "ibm,partition-name", &name))
+       ret = of_property_read_string(root, "ibm,partition-name", &name);
+       of_node_put(root);
+       if (ret)
                return -ENOENT;
 
        seq_printf(m, "partition_name=%s\n", name);

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index ecea85c74c43fa9f697dadaa7857589cb25e191a..284a6fa04b0c27b8b0345986eff654a1ea4058db 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -1029,9 +1029,11 @@ static void __init pseries_add_hw_description(void)
                return;
        }
 
-       if (of_property_read_bool(of_root, "ibm,powervm-partition") ||
-           of_property_read_bool(of_root, "ibm,fw-net-version"))
+       dn = of_find_node_by_path("/");
+       if (of_property_read_bool(dn, "ibm,powervm-partition") ||
+           of_property_read_bool(dn, "ibm,fw-net-version"))
                seq_buf_printf(&ppc_hw_desc, "hv:phyp ");
+       of_node_put(dn);
 }
 
 /*
@@ -1091,7 +1093,11 @@ static void pseries_power_off(void)
 
 static int __init pSeries_probe(void)
 {
-       if (!of_node_is_type(of_root, "chrp"))
+       struct device_node *root = of_find_node_by_path("/");
+       bool ret = of_node_is_type(root, "chrp");
+
+       of_node_put(root);
+       if (!ret)
                return 0;
 
        /* Cell blades firmware claims to be chrp while it's not. Until this