Commit 0aafbdf3 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Make generic_calibrate_decr() the default 



ppc_md.calibrate_decr() is a mandatory item. Its nullity is never
checked so it must be non null on all platforms.

Most platforms define generic_calibrate_decr() as their
ppc_md.calibrate_decr(). Have time_init() call
generic_calibrate_decr() when ppc_md.calibrate_decr() is NULL,
and remove default assignment from all machines.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6cb9865d916231c38401ba34ad1a98c249fae135.1676711562.git.christophe.leroy@csgroup.eu
parent 5a81c02d

arch/powerpc/kernel/time.c

+5 −1
Original line number Diff line number Diff line
@@ -887,7 +887,11 @@ void __init time_init(void) 
	unsigned shift;



	/* Normal PowerPC with timebase register */

	if (ppc_md.calibrate_decr)

		ppc_md.calibrate_decr();

	else

		generic_calibrate_decr();



	printk(KERN_DEBUG "time_init: decrementer frequency = %lu.%.6lu MHz\n",

	       ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);

	printk(KERN_DEBUG "time_init: processor frequency   = %lu.%.6lu MHz\n",

arch/powerpc/platforms/40x/ppc40x_simple.c

+0 −1
Original line number Diff line number Diff line
@@ -74,5 +74,4 @@ define_machine(ppc40x_simple) { 
	.init_IRQ = uic_init_tree,

	.get_irq = uic_get_irq,

	.restart = ppc4xx_reset_system,

	.calibrate_decr = generic_calibrate_decr,

};

arch/powerpc/platforms/44x/canyonlands.c

+0 −1
Original line number Diff line number Diff line
@@ -114,5 +114,4 @@ define_machine(canyonlands) { 
	.init_IRQ = uic_init_tree,

	.get_irq = uic_get_irq,

	.restart = ppc4xx_reset_system,

	.calibrate_decr = generic_calibrate_decr,

};

arch/powerpc/platforms/44x/ebony.c

+0 −1
Original line number Diff line number Diff line
@@ -58,5 +58,4 @@ define_machine(ebony) { 
	.init_IRQ		= uic_init_tree,

	.get_irq		= uic_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr		= generic_calibrate_decr,

};

arch/powerpc/platforms/44x/fsp2.c

+0 −1
Original line number Diff line number Diff line
@@ -313,5 +313,4 @@ define_machine(fsp2) { 
	.init_IRQ		= fsp2_irq_init,

	.get_irq		= uic_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr		= generic_calibrate_decr,

};