leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

85xx: Round up frequency calculations to get reasonable output

Browse Source 
eg. because of rounding error we can get 799Mhz instead of 800Mhz.

Introduced DIV_ROUND_UP and roundup taken from linux kernel.

Signed-off-by: Dejan Minic <minic@freescale.com>
Signed-off-by: Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Kumar Gala 2008-04-21 09:28:36 -05:00 committed by Wolfgang Denk
parent 0aa88c8266
commit 022f121635
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpu/mpc85xx/cpu.c
View File

@ -116,22 +116,21 @@ int checkcpu (void)
get_sys_info(&sysinfo); get_sys_info(&sysinfo);
puts("Clock Configuration:\n"); puts("Clock Configuration:\n");
printf(" CPU:%4lu MHz, ", sysinfo.freqProcessor / 1000000); printf(" CPU:%4lu MHz, ", DIV_ROUND_UP(sysinfo.freqProcessor,1000000));
printf("CCB:%4lu MHz,\n", sysinfo.freqSystemBus / 1000000); printf("CCB:%4lu MHz,\n", DIV_ROUND_UP(sysinfo.freqSystemBus,1000000));
ddr_ratio = ((gur->porpllsr) & 0x00003e00) >> 9; ddr_ratio = ((gur->porpllsr) & 0x00003e00) >> 9;
switch (ddr_ratio) { switch (ddr_ratio) {
case 0x0: case 0x0:
printf(" DDR:%4lu MHz (%lu MT/s data rate), ", printf(" DDR:%4lu MHz (%lu MT/s data rate), ",
sysinfo.freqDDRBus / 2000000, sysinfo.freqDDRBus / 1000000); DIV_ROUND_UP(sysinfo.freqDDRBus,2000000), DIV_ROUND_UP(sysinfo.freqDDRBus,1000000));
break; break;
case 0x7: case 0x7:
printf(" DDR:%4lu MHz (%lu MT/s data rate) (Synchronous), ", printf(" DDR:%4lu MHz (%lu MT/s data rate) (Synchronous), ",
sysinfo.freqDDRBus / 2000000, sysinfo.freqDDRBus / 1000000); DIV_ROUND_UP(sysinfo.freqDDRBus, 2000000), DIV_ROUND_UP(sysinfo.freqDDRBus, 1000000));
break; break;
default: default:
printf(" DDR:%4lu MHz (%lu MT/s data rate) (Asynchronous), ", printf(" DDR:%4lu MHz (%lu MT/s data rate) (Asynchronous), ",
sysinfo.freqDDRBus / 2000000, sysinfo.freqDDRBus / 1000000); DIV_ROUND_UP(sysinfo.freqDDRBus, 2000000), DIV_ROUND_UP(sysinfo.freqDDRBus,1000000));
break; break;
} }
@ -154,7 +153,7 @@ int checkcpu (void)
clkdiv *= 2; clkdiv *= 2;
#endif #endif
printf("LBC:%4lu MHz\n", printf("LBC:%4lu MHz\n",
sysinfo.freqSystemBus / 1000000 / clkdiv); DIV_ROUND_UP(sysinfo.freqSystemBus, 1000000) / clkdiv);
} else { } else {
printf("LBC: unknown (lcrr: 0x%08x)\n", lcrr); printf("LBC: unknown (lcrr: 0x%08x)\n", lcrr);
} }

3
include/common.h
View File

@ -670,6 +670,9 @@ void inline show_boot_progress (int val);
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
/* Multicore arch functions */ /* Multicore arch functions */
#ifdef CONFIG_MP #ifdef CONFIG_MP
int cpu_status(int nr); int cpu_status(int nr);