K8 RAM init debug messages are pretty short and sometimes cryptic. Make
them a bit more verbose and hopefully more understandable.

Signed-off-by: Carl-Daniel Hailfinger <[email protected]>

Index: LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit.c
===================================================================
--- LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit.c    
(Revision 4339)
+++ LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit.c    
(Arbeitskopie)
@@ -850,14 +850,18 @@
        }
 
        /* Report the amount of memory. */
-       printk_spew("RAM: 0x%08x kB\n", tom_k);
+       printk_debug("RAM end at 0x%08x kB, hole starts at 0x%08x kB\n",
+               tom_k, hole_startk);
 
        /* 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
@@ -871,6 +875,7 @@
 #endif
                tom_k = 0x3f0000;
        }
+       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 @@
 
        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 @@
                        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++) {
Index: 
LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit_f.c
===================================================================
--- LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit_f.c  
(Revision 4339)
+++ LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit_f.c  
(Arbeitskopie)
@@ -1049,14 +1049,18 @@
        }
 
        /* Report the amount of memory. */
-       printk_debug("RAM: 0x%08x kB\n", tom_k);
+       printk_debug("RAM end at 0x%08x kB, hole starts at 0x%08x kB\n",
+               tom_k, hole_startk);
 
        /* 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
@@ -1070,6 +1074,7 @@
 #endif
                tom_k = 0x3f0000;
        }
+       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 @@
 
        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 @@
                        }
                        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++) {


-- 
http://www.hailfinger.org/

Index: LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit.c
===================================================================
--- LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit.c    
(Revision 4339)
+++ LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit.c    
(Arbeitskopie)
@@ -850,14 +850,18 @@
        }
 
        /* Report the amount of memory. */
-       printk_spew("RAM: 0x%08x kB\n", tom_k);
+       printk_debug("RAM end at 0x%08x kB, hole starts at 0x%08x kB\n",
+               tom_k, hole_startk);
 
        /* 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
@@ -871,6 +875,7 @@
 #endif
                tom_k = 0x3f0000;
        }
+       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 @@
 
        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 @@
                        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++) {
Index: 
LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit_f.c
===================================================================
--- LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit_f.c  
(Revision 4339)
+++ LinuxBIOSv2-k8_raminit_debugmessages/src/northbridge/amd/amdk8/raminit_f.c  
(Arbeitskopie)
@@ -1049,14 +1049,18 @@
        }
 
        /* Report the amount of memory. */
-       printk_debug("RAM: 0x%08x kB\n", tom_k);
+       printk_debug("RAM end at 0x%08x kB, hole starts at 0x%08x kB\n",
+               tom_k, hole_startk);
 
        /* 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
@@ -1070,6 +1074,7 @@
 #endif
                tom_k = 0x3f0000;
        }
+       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 @@
 
        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 @@
                        }
                        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++) {
-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to