Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add secondary CPUs processor frequency for e500 core

Browse source 
This patch updates e500 freqProcessor to array based on CONFIG_NUM_CPUS,
and prints each CPU's frequency separately. It also fixes up each CPU's
frequency in "clock-frequency" of fdt blob.

Signed-off-by: James Yang <James.Yang@freescale.com>
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
This commit is contained in:
Haiying Wang 2009-01-15 11:58:35 -05:00 • committed by Andrew Fleming-AFLEMING
parent bf5b1f0c0d
commit 2fc7eb0cfc
4 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cpu/mpc85xx/cpu.c
View file

@ -90,6 +90,7 @@ int checkcpu (void)
#else #else
u32 ddr_ratio = 0; u32 ddr_ratio = 0;
#endif #endif
int i;
svr = get_svr(); svr = get_svr();
ver = SVR_SOC_VER(svr); ver = SVR_SOC_VER(svr);
@ -141,8 +142,10 @@ int checkcpu (void)
get_sys_info(&sysinfo); get_sys_info(&sysinfo);
puts("Clock Configuration:\n"); puts("Clock Configuration:\n ");
printf(" CPU:%-4s MHz, ", strmhz(buf1, sysinfo.freqProcessor)); for (i = 0; i < CONFIG_NUM_CPUS; i++)
printf("CPU%d:%-4s MHz, ",
i,strmhz(buf1, sysinfo.freqProcessor[i]));
printf("CCB:%-4s MHz,\n", strmhz(buf1, sysinfo.freqSystemBus)); printf("CCB:%-4s MHz,\n", strmhz(buf1, sysinfo.freqSystemBus));
switch (ddr_ratio) { switch (ddr_ratio) {

15
cpu/mpc85xx/fdt.c
View file

@ -213,6 +213,10 @@ void fdt_add_enet_stashing(void *fdt)
void ft_cpu_setup(void *blob, bd_t *bd) void ft_cpu_setup(void *blob, bd_t *bd)
{ {
int off;
int val;
sys_info_t sysinfo;
/* delete crypto node if not on an E-processor */ /* delete crypto node if not on an E-processor */
if (!IS_E_PROCESSOR(get_svr())) if (!IS_E_PROCESSOR(get_svr()))
fdt_fixup_crypto_node(blob, 0); fdt_fixup_crypto_node(blob, 0);
@ -228,8 +232,15 @@ void ft_cpu_setup(void *blob, bd_t *bd)
"timebase-frequency", bd->bi_busfreq / 8, 1); "timebase-frequency", bd->bi_busfreq / 8, 1);
do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
"bus-frequency", bd->bi_busfreq, 1); "bus-frequency", bd->bi_busfreq, 1);
do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, get_sys_info(&sysinfo);
"clock-frequency", bd->bi_intfreq, 1); off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4);
while (off != -FDT_ERR_NOTFOUND) {
u32 *reg = (u32 *)fdt_getprop(blob, off, "reg", 0);
val = cpu_to_fdt32(sysinfo.freqProcessor[*reg]);
fdt_setprop(blob, off, "clock-frequency", &val, 4);
off = fdt_node_offset_by_prop_value(blob, off, "device_type",
"cpu", 4);
}
do_fixup_by_prop_u32(blob, "device_type", "soc", 4, do_fixup_by_prop_u32(blob, "device_type", "soc", 4,
"bus-frequency", bd->bi_busfreq, 1); "bus-frequency", bd->bi_busfreq, 1);

10
cpu/mpc85xx/speed.c
View file

@ -39,17 +39,19 @@ void get_sys_info (sys_info_t * sysInfo)
volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
uint plat_ratio,e500_ratio,half_freqSystemBus; uint plat_ratio,e500_ratio,half_freqSystemBus;
uint lcrr_div; uint lcrr_div;
int i;
plat_ratio = (gur->porpllsr) & 0x0000003e; plat_ratio = (gur->porpllsr) & 0x0000003e;
plat_ratio >>= 1; plat_ratio >>= 1;
sysInfo->freqSystemBus = plat_ratio * CONFIG_SYS_CLK_FREQ; sysInfo->freqSystemBus = plat_ratio * CONFIG_SYS_CLK_FREQ;
e500_ratio = (gur->porpllsr) & 0x003f0000;
e500_ratio >>= 16;
/* Divide before multiply to avoid integer /* Divide before multiply to avoid integer
* overflow for processor speeds above 2GHz */ * overflow for processor speeds above 2GHz */
half_freqSystemBus = sysInfo->freqSystemBus/2; half_freqSystemBus = sysInfo->freqSystemBus/2;
sysInfo->freqProcessor = e500_ratio*half_freqSystemBus; for (i = 0; i < CONFIG_NUM_CPUS; i++) {
e500_ratio = ((gur->porpllsr) >> (i * 8 + 16)) & 0x3f;
sysInfo->freqProcessor[i] = e500_ratio * half_freqSystemBus;
}
/* Note: freqDDRBus is the MCLK frequency, not the data rate. */ /* Note: freqDDRBus is the MCLK frequency, not the data rate. */
sysInfo->freqDDRBus = sysInfo->freqSystemBus; sysInfo->freqDDRBus = sysInfo->freqSystemBus;
@ -105,7 +107,7 @@ int get_clocks (void)
dfbrg = (sccr & SCCR_DFBRG_MSK) >> SCCR_DFBRG_SHIFT; dfbrg = (sccr & SCCR_DFBRG_MSK) >> SCCR_DFBRG_SHIFT;
#endif #endif
get_sys_info (&sys_info); get_sys_info (&sys_info);
gd->cpu_clk = sys_info.freqProcessor; gd->cpu_clk = sys_info.freqProcessor[0];
gd->bus_clk = sys_info.freqSystemBus; gd->bus_clk = sys_info.freqSystemBus;
gd->mem_clk = sys_info.freqDDRBus; gd->mem_clk = sys_info.freqDDRBus;
gd->lbc_clk = sys_info.freqLocalBus; gd->lbc_clk = sys_info.freqLocalBus;

6
include/e500.h
View file

@ -8,9 +8,13 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifndef CONFIG_NUM_CPUS
#define CONFIG_NUM_CPUS 1
#endif
typedef struct typedef struct
{ {
unsigned long freqProcessor; unsigned long freqProcessor[CONFIG_NUM_CPUS];
unsigned long freqSystemBus; unsigned long freqSystemBus;
unsigned long freqDDRBus; unsigned long freqDDRBus;
unsigned long freqLocalBus; unsigned long freqLocalBus;