MIPS: SGI-IP27: Store cpu speed when scanning for CPUs and use it later

Remember CPU speed while scanning for available CPUs to avoid
looking it up a second time when printing CPU speed.

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h
index 3c94ffc06a70f3ced46826a48e9e4b8166c6ba66..d66cc53feab82d2b124c4725537c921bcd965f19 100644 (file)
--- a/arch/mips/include/asm/mach-ip27/topology.h
+++ b/arch/mips/include/asm/mach-ip27/topology.h
@@ -7,6 +7,7 @@
 
 struct cpuinfo_ip27 {
        nasid_t         p_nasid;        /* my node ID in numa-as-id-space */
+       unsigned short  p_speed;        /* cpu speed in MHz */
        unsigned char   p_slice;        /* Physical position on node board */
 };
 

diff --git a/arch/mips/sgi-ip27/ip27-common.h b/arch/mips/sgi-ip27/ip27-common.h
index cdebf1726e4a4bc80826eb6bbc93a9b5e4913031..ed008a08464c208cc1944cfbd6fe5de31e14fee4 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-common.h
+++ b/arch/mips/sgi-ip27/ip27-common.h
@@ -6,7 +6,6 @@
 extern nasid_t master_nasid;
 
 extern void cpu_node_probe(void);
-extern void cpu_time_init(void);
 extern void hub_rt_clock_event_init(void);
 extern void hub_rtc_init(nasid_t nasid);
 extern void install_cpu_nmi_handler(int slice);

diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index 9822f7a8ad627432b81d86386cd169026c710203..84a78bd1386a236a5e916d3d64bcb4884f8cca51 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -83,7 +83,8 @@ void per_cpu_init(void)
 
        per_hub_init(nasid);
 
-       cpu_time_init();
+       pr_info("CPU %d clock is %dMHz.\n", cpu, sn_cpu_info[cpu].p_speed);
+
        install_ipi();
 
        /* Install our NMI handler if symmon hasn't installed one. */

diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 3966716835ea2f1315d5103bc473deea93dc001f..5d2652a1d35a5e2852089e37dff42b30247154a8 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -47,6 +47,8 @@ static int node_scan_cpus(nasid_t nasid, int highest)
                                set_cpu_possible(cpuid, true);
                                cputonasid(cpus_found) = nasid;
                                cputoslice(cpus_found) = acpu->cpu_info.physid;
+                               sn_cpu_info[cpus_found].p_speed =
+                                                       acpu->cpu_speed;
                                cpus_found++;
                        }
                        acpu = (klcpu_t *)find_component(brd, (klinfo_t *)acpu,

diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 5839bdd8442f80bfe8ca365ec0e58bd595b503ac..6b7126a42e726d1a6bab44be848a1dfa497d398e 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -150,25 +150,6 @@ void __init plat_time_init(void)
        hub_rt_clock_event_init();
 }
 
-void cpu_time_init(void)
-{
-       lboard_t *board;
-       klcpu_t *cpu;
-       int cpuid;
-
-       /* Don't use ARCS.  ARCS is fragile.  Klconfig is simple and sane.  */
-       board = find_lboard(KL_CONFIG_INFO(get_nasid()), KLTYPE_IP27);
-       if (!board)
-               panic("Can't find board info for myself.");
-
-       cpuid = LOCAL_HUB_L(PI_CPU_NUM) ? IP27_CPU0_INDEX : IP27_CPU1_INDEX;
-       cpu = (klcpu_t *) KLCF_COMP(board, cpuid);
-       if (!cpu)
-               panic("No information about myself?");
-
-       printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed);
-}
-
 void hub_rtc_init(nasid_t nasid)
 {