MIPS: Netlogic: use preset loops per jiffy

Doing calibrate delay on a hardware thread will be inaccurate since
it depends on the load on other threads in the core. It will also
slow down the boot process when done for 128 hardware threads. Switch
to a pre-computed loops per jiffy based on the core frequency. The
value is computed based on the core frequency and roughly matches the
value calculated by calibrate_delay().

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Patchwork: http://patchwork.linux-mips.org/patch/4791/
Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/arch/mips/netlogic/common/time.c b/arch/mips/netlogic/common/time.c
index 20f89bc0507f0df7b30a20a8e0810ba9752046db..5c56555380bb18b86d49fea7321ebcd4df16eea5 100644 (file)
--- a/arch/mips/netlogic/common/time.c
+++ b/arch/mips/netlogic/common/time.c
@@ -98,6 +98,10 @@ void __init plat_time_init(void)
 {
        nlm_init_pic_timer();
        mips_hpt_frequency = nlm_get_cpu_frequency();
+       if (current_cpu_type() == CPU_XLR)
+               preset_lpj = mips_hpt_frequency / (3 * HZ);
+       else
+               preset_lpj = mips_hpt_frequency / (2 * HZ);
        pr_info("MIPS counter frequency [%ld]\n",
                        (unsigned long)mips_hpt_frequency);
 }