summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRegina König2021-04-21 16:36:52 +0200
committerRegina König2021-04-21 16:36:52 +0200
commitf414fd536b1a5b607beea61e9ab3f4e30c39693b (patch)
tree8a3a6e83022630c4e02526abd7d7d5ce2a71ded5
parentMove cprint statements of memspeed into print_mainscreen() (diff)
downloadmemtest86-f414fd536b1a5b607beea61e9ab3f4e30c39693b.tar.gz
memtest86-f414fd536b1a5b607beea61e9ab3f4e30c39693b.tar.xz
memtest86-f414fd536b1a5b607beea61e9ab3f4e30c39693b.zip
Display cache information
-rw-r--r--efi_memtest/memtest86+/efi/display.c4
-rw-r--r--efi_memtest/memtest86+/efi/init.c4
-rw-r--r--efi_memtest/memtest86+/main.c5
3 files changed, 7 insertions, 6 deletions
diff --git a/efi_memtest/memtest86+/efi/display.c b/efi_memtest/memtest86+/efi/display.c
index d73d399..7ae3c2a 100644
--- a/efi_memtest/memtest86+/efi/display.c
+++ b/efi_memtest/memtest86+/efi/display.c
@@ -56,7 +56,7 @@ int print_mainscreen() {
extern ulong speed_l1;
extern ulong speed_l2;
extern ulong speed_l3;
- extern ulong memspeed_end_high;
+ //extern ulong memspeed_end_high;
clear_screen();
@@ -118,7 +118,7 @@ int print_mainscreen() {
dprint(4, 16, speed_l3, 6, 0);
}
- hprint(11,40,memspeed_end_high);
+ // TODO it just prints zeros. hprint(11,40,memspeed_end_high);
// Print out cache information
cprint(2, 0, "L1 Cache: K ");
diff --git a/efi_memtest/memtest86+/efi/init.c b/efi_memtest/memtest86+/efi/init.c
index 7b4fb08..cd9a851 100644
--- a/efi_memtest/memtest86+/efi/init.c
+++ b/efi_memtest/memtest86+/efi/init.c
@@ -1093,7 +1093,7 @@ void cpu_cache_speed() {
}
/* Measure and display memory speed, multitasked using all CPUs */
-ulong spd[MAX_CPUS];
+//ulong spd[MAX_CPUS]; // TODO can we remove this var?
void get_mem_speed(int me, int ncpus)
{
int i;
@@ -1102,7 +1102,7 @@ void get_mem_speed(int me, int ncpus)
/* Determine memory speed. To find the memory speed we use
* A block size that is the sum of all the L1, L2 & L3 caches
* in all cpus * 6 */
- i = (l3_cache + l2_cache + l1_cache) * 4;
+ i = (l3_cache + l2_cache + l1_cache) * 4; // TODO is this calculation correct? The car ncpus is not used
/* Make sure that we have enough memory to do the test */
/* If not use all we have */
diff --git a/efi_memtest/memtest86+/main.c b/efi_memtest/memtest86+/main.c
index 8865873..a014e1f 100644
--- a/efi_memtest/memtest86+/main.c
+++ b/efi_memtest/memtest86+/main.c
@@ -562,10 +562,11 @@ void test_start(void)
int_to_charr(cpu_id.fid.bits.lm, log, &length);
print_log(log, length);
}
- setup_mm_modes();
+
+ setup_mm_modes(); // TODO do we need it anymore? Since we already start in 64 bit mode
/* Get the memory Speed with all CPUs */
- get_mem_speed(my_cpu_num, num_cpus);
+ //get_mem_speed(my_cpu_num, num_cpus);
}
/* Set the initialized flag only after all of the CPU's have