Commit 83e8eb99 authored by Pavel Tatashin's avatar Pavel Tatashin Committed by David S. Miller
Browse files

sparc64: initialize time early 



In Linux it is possible to configure printk() to output timestamp next to
every line. This is very useful to determine the slow parts of the boot
process, and also to avoid regressions, as boot time is visiable to
everyone.

Also, there are scripts that change these time stamps to intervals.

However, on larger machines these timestamps start appearing many seconds,
and even minutes into the boot process. This patch gets stick-frequency
property early from OpenBoot, and uses its value to initialize time stamps
before the first printk() messages are printed.

Signed-off-by: default avatarPavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: default avatarSteven Sistare <steven.sistare@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89108c34

arch/sparc/kernel/kernel.h

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs); 
void do_signal32(struct pt_regs * regs);

asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp);



/* time_64.c */

void __init time_init_early(void);



/* compat_audit.c */

extern unsigned int sparc32_dir_class[];

extern unsigned int sparc32_chattr_class[];

arch/sparc/kernel/setup_64.c

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ void __init start_early_boot(void) 
	}

	current_thread_info()->cpu = cpu;



	time_init_early();

	prom_init_report();

	start_kernel();

}

arch/sparc/kernel/time_64.c

+8 −13
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <asm/irq_regs.h>



#include "entry.h"

#include "kernel.h"



DEFINE_SPINLOCK(rtc_lock);
@@ -258,9 +259,7 @@ static int stick_add_compare(unsigned long adj) 


static unsigned long stick_get_frequency(void)

{

	struct device_node *dp = of_find_node_by_path("/");



	return of_getintprop_default(dp, "stick-frequency", 0);

	return prom_getint(prom_root_node, "stick-frequency");

}



static struct sparc64_tick_ops stick_operations __read_mostly = {
@@ -792,10 +791,8 @@ static void init_tick_ops(struct sparc64_tick_ops *ops) 
	tick_operations = *ops;

}



void __init time_init(void)

void __init time_init_early(void)

{

	unsigned long freq;



	if (tlb_type == spitfire) {

		if (is_hummingbird())

			init_tick_ops(&hbtick_operations);
@@ -804,17 +801,15 @@ void __init time_init(void) 
	} else {

		init_tick_ops(&stick_operations);

	}

}



void __init time_init(void)

{

	unsigned long freq;



	freq = tick_operations.frequency;

	tb_ticks_per_usec = freq / USEC_PER_SEC;



	tick_operations.ticks_per_nsec_quotient =

		clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT);



	tick_operations.offset = (tick_operations.get_tick()

			* tick_operations.ticks_per_nsec_quotient)

			>> SPARC64_NSEC_PER_CYC_SHIFT;



	clocksource_tick.name = tick_operations.name;

	clocksource_tick.read = clocksource_tick_read;

CRA Git | Maintained and supported by SUSTech CRA and CCSE