[SPARC64]: Convert cpu_find_by_*() interface to in-kernel PROM device tree.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 57 insertions, 61 deletions

diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c
index 136f872a8a57..389301c95cb2 100644
--- a/arch/sparc64/kernel/devices.c
+++ b/arch/sparc64/kernel/devices.c
@@ -133,38 +133,44 @@ static const char *cpu_mid_prop(void)
         return "portid";
 }
 
-static int get_cpu_mid(int prom_node)
+static int get_cpu_mid(struct device_node *dp)
 {
+        struct property *prop;
+
         if (tlb_type == hypervisor) {
-                struct linux_prom64_registers reg;
+                struct linux_prom64_registers *reg;
+                int len;
 
-                if (prom_getproplen(prom_node, "cpuid") == 4)
-                        return prom_getintdefault(prom_node, "cpuid", 0);
+                prop = of_find_property(dp, "cpuid", &len);
+                if (prop && len == 4)
+                        return *(int *) prop->value;
 
-                prom_getproperty(prom_node, "reg", (char *) &reg, sizeof(reg));
-                return (reg.phys_addr >> 32) & 0x0fffffffUL;
+                prop = of_find_property(dp, "reg", NULL);
+                reg = prop->value;
+                return (reg[0].phys_addr >> 32) & 0x0fffffffUL;
         } else {
                 const char *prop_name = cpu_mid_prop();
 
-                return prom_getintdefault(prom_node, prop_name, 0);
+                prop = of_find_property(dp, prop_name, NULL);
+                if (prop)
+                        return *(int *) prop->value;
+                return 0;
         }
 }
 
-static int check_cpu_node(int nd, int *cur_inst,
-                          int (*compare)(int, int, void *), void *compare_arg,
-                          int *prom_node, int *mid)
+static int check_cpu_node(struct device_node *dp, int *cur_inst,
+                          int (*compare)(struct device_node *, int, void *),
+                          void *compare_arg,
+                          struct device_node **dev_node, int *mid)
 {
-        char node_str[128];
-
-        prom_getstring(nd, "device_type", node_str, sizeof(node_str));
-        if (strcmp(node_str, "cpu"))
+        if (strcmp(dp->type, "cpu"))
                 return -ENODEV;
 
-        if (!compare(nd, *cur_inst, compare_arg)) {
-                if (prom_node)
-                        *prom_node = nd;
+        if (!compare(dp, *cur_inst, compare_arg)) {
+                if (dev_node)
+                        *dev_node = dp;
                 if (mid)
-                        *mid = get_cpu_mid(nd);
+                        *mid = get_cpu_mid(dp);
                 return 0;
         }
 
@@ -173,25 +179,18 @@ static int check_cpu_node(int nd, int *cur_inst,
         return -ENODEV;
 }
 
-static int __cpu_find_by(int (*compare)(int, int, void *), void *compare_arg,
-                         int *prom_node, int *mid)
+static int __cpu_find_by(int (*compare)(struct device_node *, int, void *),
+                         void *compare_arg,
+                         struct device_node **dev_node, int *mid)
 {
-        int nd, cur_inst, err;
+        struct device_node *dp;
+        int cur_inst;
 
-        nd = prom_root_node;
         cur_inst = 0;
-
-        err = check_cpu_node(nd, &cur_inst,
-                             compare, compare_arg,
-                             prom_node, mid);
-        if (err == 0)
-                return 0;
-
-        nd = prom_getchild(nd);
-        while ((nd = prom_getsibling(nd)) != 0) {
-                err = check_cpu_node(nd, &cur_inst,
-                                     compare, compare_arg,
-                                     prom_node, mid);
+        for_each_node_by_type(dp, "cpu") {
+                int err = check_cpu_node(dp, &cur_inst,
+                                         compare, compare_arg,
+                                         dev_node, mid);
                 if (err == 0)
                         return 0;
         }
@@ -199,7 +198,7 @@ static int __cpu_find_by(int (*compare)(int, int, void *), void *compare_arg,
         return -ENODEV;
 }
 
-static int cpu_instance_compare(int nd, int instance, void *_arg)
+static int cpu_instance_compare(struct device_node *dp, int instance, void *_arg)
 {
         int desired_instance = (int) (long) _arg;
 
@@ -208,27 +207,27 @@ static int cpu_instance_compare(int nd, int instance, void *_arg)
         return -ENODEV;
 }
 
-int cpu_find_by_instance(int instance, int *prom_node, int *mid)
+int cpu_find_by_instance(int instance, struct device_node **dev_node, int *mid)
 {
         return __cpu_find_by(cpu_instance_compare, (void *)(long)instance,
-                             prom_node, mid);
+                             dev_node, mid);
 }
 
-static int cpu_mid_compare(int nd, int instance, void *_arg)
+static int cpu_mid_compare(struct device_node *dp, int instance, void *_arg)
 {
         int desired_mid = (int) (long) _arg;
         int this_mid;
 
-        this_mid = get_cpu_mid(nd);
+        this_mid = get_cpu_mid(dp);
         if (this_mid == desired_mid)
                 return 0;
         return -ENODEV;
 }
 
-int cpu_find_by_mid(int mid, int *prom_node)
+int cpu_find_by_mid(int mid, struct device_node **dev_node)
 {
         return __cpu_find_by(cpu_mid_compare, (void *)(long)mid,
-                             prom_node, NULL);
+                             dev_node, NULL);
 }
 
 void __init device_scan(void)
@@ -240,50 +239,47 @@ void __init device_scan(void)
 
 #ifndef CONFIG_SMP
         {
-                int err, cpu_node, def;
+                struct device_node *dp;
+                int err, def;
 
-                err = cpu_find_by_instance(0, &cpu_node, NULL);
+                err = cpu_find_by_instance(0, &dp, NULL);
                 if (err) {
                         prom_printf("No cpu nodes, cannot continue\n");
                         prom_halt();
                 }
-                cpu_data(0).clock_tick = prom_getintdefault(cpu_node,
-                                                            "clock-frequency",
-                                                            0);
+                cpu_data(0).clock_tick =
+                        of_getintprop_default(dp, "clock-frequency", 0);
 
                 def = ((tlb_type == hypervisor) ?
                        (8 * 1024) :
                        (16 * 1024));
-                cpu_data(0).dcache_size = prom_getintdefault(cpu_node,
-                                                             "dcache-size",
-                                                             def);
+                cpu_data(0).dcache_size = of_getintprop_default(dp,
+                                                                "dcache-size",
+                                                                def);
 
                 def = 32;
                 cpu_data(0).dcache_line_size =
-                        prom_getintdefault(cpu_node, "dcache-line-size",
-                                           def);
+                        of_getintprop_default(dp, "dcache-line-size", def);
 
                 def = 16 * 1024;
-                cpu_data(0).icache_size = prom_getintdefault(cpu_node,
-                                                             "icache-size",
-                                                             def);
+                cpu_data(0).icache_size = of_getintprop_default(dp,
+                                                                "icache-size",
+                                                                def);
 
                 def = 32;
                 cpu_data(0).icache_line_size =
-                        prom_getintdefault(cpu_node, "icache-line-size",
-                                           def);
+                        of_getintprop_default(dp, "icache-line-size", def);
 
                 def = ((tlb_type == hypervisor) ?
                        (3 * 1024 * 1024) :
                        (4 * 1024 * 1024));
-                cpu_data(0).ecache_size = prom_getintdefault(cpu_node,
-                                                             "ecache-size",
-                                                             def);
+                cpu_data(0).ecache_size = of_getintprop_default(dp,
+                                                                "ecache-size",
+                                                                def);
 
                 def = 64;
                 cpu_data(0).ecache_line_size =
-                        prom_getintdefault(cpu_node, "ecache-line-size",
-                                           def);
+                        of_getintprop_default(dp, "ecache-line-size", def);
                 printk("CPU[0]: Caches "
                        "D[sz(%d):line_sz(%d)] "
                        "I[sz(%d):line_sz(%d)] "