K8 RAM init debug messages are pretty short and sometimes cryptic. Make
them a bit more verbose and hopefully more understandable. Old messages for my machine with 5 GB: RAM: 0x00400000 kB Ram3 [...] Initializing memory: done RAM: 0x00500000 kB New messages: RAM end at 0x00400000 kB Adjusting lower RAM end Lower RAM end at 0x003f0000 kB Ram3 [...] Initializing memory: done Handling memory hole at 0x00300000 (default) RAM end at 0x00500000 kB Handling memory mapped above 4 GB Upper RAM end at 0x00500000 kB Correcting memory amount mapped below 4 GB Adjusting lower RAM end Lower RAM end at 0x00300000 kB Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4341 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
87e7050bff
commit
3c45a96138
|
@ -850,14 +850,17 @@ static void set_top_mem(unsigned tom_k, unsigned hole_startk)
|
|||
}
|
||||
|
||||
/* Report the amount of memory. */
|
||||
printk_spew("RAM: 0x%08x kB\n", tom_k);
|
||||
printk_debug("RAM end at 0x%08x kB\n", tom_k);
|
||||
|
||||
/* Now set top of memory */
|
||||
msr_t msr;
|
||||
if (tom_k > (4*1024*1024)) {
|
||||
printk_raminit("Handling memory mapped above 4 GB\n");
|
||||
printk_raminit("Upper RAM end at 0x%08x kB\n", tom_k);
|
||||
msr.lo = (tom_k & 0x003fffff) << 10;
|
||||
msr.hi = (tom_k & 0xffc00000) >> 22;
|
||||
wrmsr(TOP_MEM2, msr);
|
||||
printk_raminit("Correcting memory amount mapped below 4 GB\n");
|
||||
}
|
||||
|
||||
/* Leave a 64M hole between TOP_MEM and TOP_MEM2
|
||||
|
@ -870,7 +873,9 @@ static void set_top_mem(unsigned tom_k, unsigned hole_startk)
|
|||
} else
|
||||
#endif
|
||||
tom_k = 0x3f0000;
|
||||
printk_raminit("Adjusting lower RAM end\n");
|
||||
}
|
||||
printk_raminit("Lower RAM end at 0x%08x kB\n", tom_k);
|
||||
msr.lo = (tom_k & 0x003fffff) << 10;
|
||||
msr.hi = (tom_k & 0xffc00000) >> 22;
|
||||
wrmsr(TOP_MEM, msr);
|
||||
|
@ -2167,6 +2172,7 @@ static void set_hw_mem_hole(int controllers, const struct mem_controller *ctrl)
|
|||
|
||||
hole_startk = 4*1024*1024 - HW_MEM_HOLE_SIZEK;
|
||||
|
||||
printk_raminit("Handling memory hole at 0x%08x (default)\n", hole_startk);
|
||||
#if HW_MEM_HOLE_SIZE_AUTO_INC == 1
|
||||
/* We need to double check if hole_startk is valid.
|
||||
* If it is equal to the dram base address in K (base_k),
|
||||
|
@ -2191,6 +2197,7 @@ static void set_hw_mem_hole(int controllers, const struct mem_controller *ctrl)
|
|||
basek_pri = base_k;
|
||||
}
|
||||
|
||||
printk_raminit("Handling memory hole at 0x%08x (adjusted)\n", hole_startk);
|
||||
#endif
|
||||
/* Find node number that needs the memory hole configured */
|
||||
for (i=0; i<controllers; i++) {
|
||||
|
|
|
@ -1049,14 +1049,17 @@ static void set_top_mem(unsigned tom_k, unsigned hole_startk)
|
|||
}
|
||||
|
||||
/* Report the amount of memory. */
|
||||
printk_debug("RAM: 0x%08x kB\n", tom_k);
|
||||
printk_debug("RAM end at 0x%08x kB\n", tom_k);
|
||||
|
||||
/* Now set top of memory */
|
||||
msr_t msr;
|
||||
if (tom_k > (4*1024*1024)) {
|
||||
printk_raminit("Handling memory mapped above 4 GB\n");
|
||||
printk_raminit("Upper RAM end at 0x%08x kB\n", tom_k);
|
||||
msr.lo = (tom_k & 0x003fffff) << 10;
|
||||
msr.hi = (tom_k & 0xffc00000) >> 22;
|
||||
wrmsr(TOP_MEM2, msr);
|
||||
printk_raminit("Correcting memory amount mapped below 4 GB\n");
|
||||
}
|
||||
|
||||
/* Leave a 64M hole between TOP_MEM and TOP_MEM2
|
||||
|
@ -1069,7 +1072,9 @@ static void set_top_mem(unsigned tom_k, unsigned hole_startk)
|
|||
} else
|
||||
#endif
|
||||
tom_k = 0x3f0000;
|
||||
printk_raminit("Adjusting lower RAM end\n");
|
||||
}
|
||||
printk_raminit("Lower RAM end at 0x%08x kB\n", tom_k);
|
||||
msr.lo = (tom_k & 0x003fffff) << 10;
|
||||
msr.hi = (tom_k & 0xffc00000) >> 22;
|
||||
wrmsr(TOP_MEM, msr);
|
||||
|
@ -2938,6 +2943,7 @@ static void set_hw_mem_hole(int controllers, const struct mem_controller *ctrl)
|
|||
|
||||
hole_startk = 4*1024*1024 - HW_MEM_HOLE_SIZEK;
|
||||
|
||||
printk_raminit("Handling memory hole at 0x%08x (default)\n", hole_startk);
|
||||
#if HW_MEM_HOLE_SIZE_AUTO_INC == 1
|
||||
/* We need to double check if the hole_startk is valid, if it is equal
|
||||
to basek, we need to decrease it some */
|
||||
|
@ -2958,6 +2964,7 @@ static void set_hw_mem_hole(int controllers, const struct mem_controller *ctrl)
|
|||
}
|
||||
basek_pri = base_k;
|
||||
}
|
||||
printk_raminit("Handling memory hole at 0x%08x (adjusted)\n", hole_startk);
|
||||
#endif
|
||||
/* find node index that need do set hole */
|
||||
for (i=0; i < controllers; i++) {
|
||||
|
|
Loading…
Reference in New Issue