powerpc: support ibm,extended-*-frequency properties
PATCH 1/1 powerpc: support ibm,extended-*-frequency properties
Support the ibm,extended-*-frequency properties found in recent POWER5 firmware:
cpus/PowerPC,POWER5@0/clock-frequency
59aa5880 (1504336000)
cpus/PowerPC,POWER5@0/ibm,extended-clock-frequency
00000000 59aa5880
cpus/PowerPC,POWER5@0/timebase-frequency
0b354b10 (188042000)
cpus/PowerPC,POWER5@0/ibm,extended-timebase-frequency
00000000 0b354b10---
arch/powerpc/kernel/time.c +30 -27
@@ -857,42 +857,50 @@ int do_settimeofday(struct timespec *tv)EXPORT_SYMBOL (do_settimeofday); -void __init generic_calibrate_decr (void ) +static int __init get_freq (char *name,int cells,unsigned long *val) {struct device_node *cpu;unsigned int *fp; -int node_found; +int found =0 ; -/* -* The cpu node should have a timebase-frequency property -* to tell us the rate at which the decrementer counts. -*/ +/* The cpu node should have timebase and clock frequency properties */ cpu =of_find_node_by_type (NULL ,"cpu" ); - ppc_tb_freq =DEFAULT_TB_FREQ ;/* hardcoded default */ - node_found =0 ;if (cpu) { - fp = (unsigned int *)get_property (cpu,"timebase-frequency" , -NULL ); + fp = (unsigned int *)get_property (cpu, name,NULL );if (fp) { - node_found =1 ; - ppc_tb_freq = *fp; + found =1 ; + *val =0 ; +while (cells--) + *val = (*val <<32 ) | *fp++; } + +of_node_put (cpu); } -if (!node_found) + +return found; +} + +void __init generic_calibrate_decr (void ) +{ + ppc_tb_freq =DEFAULT_TB_FREQ ;/* hardcoded default */ + +if (!get_freq ("ibm,extended-timebase-frequency" ,2 , &ppc_tb_freq) && + !get_freq ("timebase-frequency" ,1 , &ppc_tb_freq)) { +printk (KERN_ERR "WARNING: Estimating decrementer frequency " "(not found)\n" ); + } - ppc_proc_freq =DEFAULT_PROC_FREQ ; - node_found =0 ; -if (cpu) { - fp = (unsigned int *)get_property (cpu,"clock-frequency" , -NULL ); -if (fp) { - node_found =1 ; - ppc_proc_freq = *fp; - } + ppc_proc_freq =DEFAULT_PROC_FREQ ;/* hardcoded default */ + +if (!get_freq ("ibm,extended-clock-frequency" ,2 , &ppc_proc_freq) && + !get_freq ("clock-frequency" ,1 , &ppc_proc_freq)) { + +printk (KERN_ERR "WARNING: Estimating processor frequency " +"(not found)\n" ); } +#ifdef CONFIG_BOOKE /* Set the time base to zero */ mtspr (SPRN_TBWL ,0 );
@@ -904,11 +912,6 @@ void __init generic_calibrate_decr(void)/* Enable decrementer interrupt */ mtspr (SPRN_TCR ,TCR_DIE );#endif -if (!node_found) -printk (KERN_ERR "WARNING: Estimating processor frequency " -"(not found)\n" ); - -of_node_put (cpu); }unsigned long get_boot_time (void )
Hi Anton,
Quoted 11 lines
Support the ibm,extended-*-frequency properties found in recent POWER5 firmware:
cpus/PowerPC,POWER5@0/clock-frequency
59aa5880 (1504336000) cpus/PowerPC,POWER5@0/ibm,extended-clock-frequency 00000000 59aa5880 cpus/PowerPC,POWER5@0/timebase-frequency 0b354b10 (188042000) cpus/PowerPC,POWER5@0/ibm,extended-timebase-frequency 00000000 0b354b10
Could you also allow the regular "timebase-frequency" property to consist of two cells, with the same semantics? That's what some other systems do. Hey, it'd simplify this code, if anything :-)
In fact, some kernel code already does this if I'm not mistaken (the Cell port, perhaps?)
Segher
Quoted 7 lines
Could you also allow the regular "timebase-frequency" property to consist of two cells, with the same semantics? That's what some other systems do. Hey, it'd simplify this code, if anything :-)
In fact, some kernel code already does this if I'm not mistaken (the Cell port, perhaps?)
Yeah it seems reasonable to just use the property size, I'll submit an incremental patch for that.
Anton
Quoted 45 lines · Anton Blanchard
Support the ibm,extended-*-frequency properties found in recent POWER5 firmware:
cpus/PowerPC,POWER5@0/clock-frequency
59aa5880 (1504336000) cpus/PowerPC,POWER5@0/ibm,extended-clock-frequency 00000000 59aa5880 cpus/PowerPC,POWER5@0/timebase-frequency 0b354b10 (188042000) cpus/PowerPC,POWER5@0/ibm,extended-timebase-frequency 00000000 0b354b10Signed-off-by Anton Blanchard <[email protected]>---
Index:
build/arch/powerpc/kernel/time.c
===================================================================
---build.orig/arch/powerpc/kernel/time.c2006-06-20
11:55:34.000000000 +1000
+++build/arch/powerpc/kernel/time.c2006-06-20 18:25:35.000000000
+1000arch/powerpc/kernel/time.c +3
-6@@ -857,42 +857,50 @@ int do_settimeofday(struct timespec *tv)EXPORT_SYMBOL (do_settimeofday); -void __init generic_calibrate_decr (void ) +static int __init get_freq (char *name,int cells,unsigned long *val) {struct device_node *cpu;unsigned int *fp; -int node_found; +int found =0 ; -/* -* The cpu node should have a timebase-frequency property -* to tell us the rate at which the decrementer counts. -*/ +/* The cpu node should have timebase and clock frequency properties */
arch/powerpc/kernel/time.c +0
-2cpu =of_find_node_by_type (NULL ,"cpu" ); - ppc_tb_freq =DEFAULT_TB_FREQ ;/* hardcoded default */ - node_found =0 ;if (cpu) {
arch/powerpc/kernel/time.c int do_settimeofday(struct timespec *tv) · line 875
Quoted 10 lines
arch/powerpc/kernel/time.c +5
-4- fp = (unsigned int *)get_property (cpu,"timebase-frequency" , -NULL ); + fp = (unsigned int *)get_property (cpu, name,NULL );if (fp) { - node_found =1 ; - ppc_tb_freq = *fp; + found =1 ; + *val =0 ; +while (cells--) + *val = (*val <<32 ) | *fp++;
Is it reasonable for cells to be greater than 1 on a 32-bit system? If not, ok to protect this with a CONFIG_PPC64
Quoted 57 lines
arch/powerpc/kernel/time.c +22
-15} + +of_node_put (cpu); } -if (!node_found) + +return found; +} + +void __init generic_calibrate_decr (void ) +{ + ppc_tb_freq =DEFAULT_TB_FREQ ;/* hardcoded default */ + +if (!get_freq ("ibm,extended-timebase-frequency" ,2 , &ppc_tb_freq) && + !get_freq ("timebase-frequency" ,1 , &ppc_tb_freq)) { +printk (KERN_ERR "WARNING: Estimating decrementer frequency " "(not found)\n" ); + } - ppc_proc_freq =DEFAULT_PROC_FREQ ; - node_found =0 ; -if (cpu) { - fp = (unsigned int *)get_property (cpu,"clock-frequency" , -NULL ); -if (fp) { - node_found =1 ; - ppc_proc_freq = *fp; - } + ppc_proc_freq =DEFAULT_PROC_FREQ ;/* hardcoded default */ + +if (!get_freq ("ibm,extended-clock-frequency" ,2 , &ppc_proc_freq) && + !get_freq ("clock-frequency" ,1 , &ppc_proc_freq)) { + +printk (KERN_ERR "WARNING: Estimating processor frequency " +"(not found)\n" ); } +#ifdef CONFIG_BOOKE /* Set the time base to zero */ mtspr (SPRN_TBWL ,0 );@@ -904,11 +912,6 @@ void __init generic_calibrate_decr(void)/* Enable decrementer interrupt */ mtspr (SPRN_TCR ,TCR_DIE );#endif -if (!node_found) -printk (KERN_ERR "WARNING: Estimating processor frequency " -"(not found)\n" ); - -of_node_put (cpu); }unsigned long get_boot_time (void )_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Quoted 1 line
Is it reasonable for cells to be greater than 1 on a 32-bit system?
Yes.
Segher
Quoted 6 lines · Kumar Gala
arch/powerpc/kernel/time.c int do_settimeofday(struct timespec *tv) · line 875
Quoted 2 lines · Anton Blanchard
arch/powerpc/kernel/time.c +2
-0+while (cells--) + *val = (*val <<32 ) | *fp++;Is it reasonable for cells to be greater than 1 on a 32-bit system? If not, ok to protect this with a
CONFIG_PPC64
Well, large values will be broken on 32-bit no matter what right now:
CC arch/powerpc/kernel/time.oarch/powerpc/kernel/time.c: In function ‘get_freq’:arch/powerpc/kernel/time.c:875: warning: left shift count >= width of type
-Olof