summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRegina König2021-08-04 01:21:13 +0200
committerRegina König2021-08-04 01:21:13 +0200
commit9920972947d316267203ad92104c329ef134fadb (patch)
tree4b9c8483714a4c65ea5d3d87899547b262bbd0ba
parentMake some corrections (diff)
downloadmemtest86-9920972947d316267203ad92104c329ef134fadb.tar.gz
memtest86-9920972947d316267203ad92104c329ef134fadb.tar.xz
memtest86-9920972947d316267203ad92104c329ef134fadb.zip
Activate Coretemp
-rw-r--r--efi_memtest/logger_config.h1
-rw-r--r--efi_memtest/memtest86+/controller.c12
-rw-r--r--efi_memtest/memtest86+/efi/init.c2
3 files changed, 13 insertions, 2 deletions
diff --git a/efi_memtest/logger_config.h b/efi_memtest/logger_config.h
index 26143b0..59da4eb 100644
--- a/efi_memtest/logger_config.h
+++ b/efi_memtest/logger_config.h
@@ -16,6 +16,7 @@ short log_pmap = 1;
short log_mem_ctrl = 0;
short log_pci_conf = 0;
short log_dmi = 0;
+short log_coretemp = 1;
// Tests
short log_tst2 = 1; \ No newline at end of file
diff --git a/efi_memtest/memtest86+/controller.c b/efi_memtest/memtest86+/controller.c
index 12eb676..92d0c06 100644
--- a/efi_memtest/memtest86+/controller.c
+++ b/efi_memtest/memtest86+/controller.c
@@ -27,6 +27,7 @@ extern struct cpu_ident cpu_id;
extern short logflag;
extern short log_mem_ctrl;
+extern short log_coretemp;
/*
@@ -82,6 +83,11 @@ static struct ecc_info {
void coretemp(void)
{
+
+ if (logflag && log_coretemp) {
+ print_log("coretemp() started.", 19);
+ }
+
unsigned int msrl, msrh;
unsigned int tjunc, tabs, tnow;
unsigned long rtcr;
@@ -117,7 +123,11 @@ void coretemp(void)
dprint(LINE_CPU+1, 30, vv->check_temp, 3, 0);
}
-
+
+ if (logflag && log_coretemp) {
+ print_log("coretemp() finished.", 20);
+ }
+
}
void print_cpu_line(float dram_freq, float fsb_freq, int ram_type)
diff --git a/efi_memtest/memtest86+/efi/init.c b/efi_memtest/memtest86+/efi/init.c
index 80e9804..920586c 100644
--- a/efi_memtest/memtest86+/efi/init.c
+++ b/efi_memtest/memtest86+/efi/init.c
@@ -327,7 +327,7 @@ void init(void) {
find_controller();
// get_spd_spec();
if(num_cpus <= 16 && !(vv->fail_safe & 4)) {
- //coretemp();
+ coretemp();
}
}