From d91c673f35cb1d662d482a64db812a7fb8b4f2e7 Mon Sep 17 00:00:00 2001 From: Regia König Date: Fri, 4 Jun 2021 16:01:15 +0200 Subject: Clean up logging information --- efi_memtest/MemtestEfi.c | 2 + efi_memtest/memtest86+/config.c | 7 ++- efi_memtest/memtest86+/controller.c | 69 ++++++++++++++---------------- efi_memtest/memtest86+/dmi.c | 10 ++--- efi_memtest/memtest86+/efi/memory_tables.c | 10 ++--- efi_memtest/memtest86+/main.c | 4 +- efi_memtest/memtest86+/memsize.c | 32 ++++++++------ efi_memtest/memtest86+/pci.c | 51 +++++++++++----------- 8 files changed, 96 insertions(+), 89 deletions(-) diff --git a/efi_memtest/MemtestEfi.c b/efi_memtest/MemtestEfi.c index 7110698..5457a58 100644 --- a/efi_memtest/MemtestEfi.c +++ b/efi_memtest/MemtestEfi.c @@ -18,6 +18,8 @@ short log_mem_tbl = 0; short log_comp_seg = 0; short log_print_pmap = 0; short log_mem_ctrl = 1; +short log_pmap = 0; +short log_pci_conf = 0; EFI_STATUS EFIAPI diff --git a/efi_memtest/memtest86+/config.c b/efi_memtest/memtest86+/config.c index 039abe7..d3411a6 100644 --- a/efi_memtest/memtest86+/config.c +++ b/efi_memtest/memtest86+/config.c @@ -26,6 +26,9 @@ extern short restart_flag; extern short onepass; extern short btflag; +extern short logflag; +extern short log_pmap; + extern void get_list(int x, int y, int len, char *buf); char save[2][POP_H][POP_W]; @@ -459,7 +462,7 @@ void pop2clear() void adj_mem(void) { - if(1) { + if(logflag && log_pmap) { char log[23] = "vvaaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -473,7 +476,7 @@ void adj_mem(void) if (vv->pmap[i].start >= vv->plim_lower && vv->pmap[i].end <= vv->plim_upper) { - if(1) print_log(">>>>> 1", 7); // TODO remove + if(logflag && log_pmap) print_log(">>>>> 1", 7); // TODO remove vv->selected_pages += (vv->pmap[i].end - vv->pmap[i].start); continue; } diff --git a/efi_memtest/memtest86+/controller.c b/efi_memtest/memtest86+/controller.c index 561cac6..5437956 100644 --- a/efi_memtest/memtest86+/controller.c +++ b/efi_memtest/memtest86+/controller.c @@ -4183,9 +4183,7 @@ static void print_memory_controller(void) /* Print advanced caracteristics */ col2 = 0; - print_log("print_controller(): 1sd", 23); - - { + if (logflag && log_mem_ctrl) { char log[23] = "ctrl.index = "; int length = 13; int_to_charr(ctrl.index, log, &length); @@ -4293,8 +4291,8 @@ static void print_memory_controller(void) void find_controller(void) { if (logflag && log_mem_ctrl) { - char log[] = "\nfind_controller(): started."; - print_log(log, sizeof(log) - 1); + char log[] = "\nfind_controller(): started."; + print_log(log, sizeof(log) - 1); } unsigned long vendor; @@ -4305,19 +4303,19 @@ void find_controller(void) result = pci_conf_read(ctrl.bus, ctrl.dev, ctrl.fn, PCI_VENDOR_ID, 2, &vendor); if (logflag && log_mem_ctrl) { - char log[48] = "find_controller(): vendor = "; - int length = 28; - int_to_charr(vendor, log, &length); - print_log(log, length); + char log[68] = "find_controller(): vendor by pci_conf = "; + int length = 40; + int_to_charr(vendor, log, &length); + print_log(log, length); } result = pci_conf_read(ctrl.bus, ctrl.dev, ctrl.fn, PCI_DEVICE_ID, 2, &device); if (logflag && log_mem_ctrl) { - char log[48] = "find_controller(): device = "; - int length = 28; - int_to_charr(device, log, &length); - print_log(log, length); + char log[60] = "find_controller(): device by pci_conf = "; + int length = 40; + int_to_charr(device, log, &length); + print_log(log, length); } // Detect IMC by CPUID @@ -4325,17 +4323,17 @@ void find_controller(void) if(vv->fail_safe & 1) { vendor = 0xFFFF; device = 0xFFFF; } if (logflag && log_mem_ctrl) { - char log[48] = "find_controller(): vendor = "; - int length = 28; - int_to_charr(vendor, log, &length); - print_log(log, length); + char log[57] = "find_controller(): vendor by cpuid = "; + int length = 37; + int_to_charr(vendor, log, &length); + print_log(log, length); } if (logflag && log_mem_ctrl) { - char log[48] = "find_controller(): device = "; - int length = 28; - int_to_charr(device, log, &length); - print_log(log, length); + char log[57] = "find_controller(): device by cpuid = "; + int length = 37; + int_to_charr(device, log, &length); + print_log(log, length); } //hprint(11,0,vendor); hprint(11,10,device); @@ -4351,10 +4349,10 @@ void find_controller(void) } if (logflag && log_mem_ctrl) { - char log[42] = "find_controller(): ctrl.index = "; - int length = 32; - int_to_charr(ctrl.index, log, &length); - print_log(log, length); + char log[42] = "find_controller(): ctrl.index = "; + int length = 32; + int_to_charr(ctrl.index, log, &length); + print_log(log, length); } if (logflag && log_mem_ctrl) { @@ -4365,14 +4363,18 @@ void find_controller(void) } if (logflag && log_mem_ctrl) { - char log[70] = "find_controller(): pci_memory_controller.name = XXXXXXXXXXXXXXXXXXXX"; - int length = 48; - string_to_charr(controllers[ctrl.index].name, log, &length); - print_log(log, length); + char log[30] = "Pointer = "; + int length = 10; + int_to_charr((unsigned long int)controllers[127].name, log, &length); + print_log(log, length); } - char* name = controllers[ctrl.index].name; - print_log(name, 10); + if (logflag && log_mem_ctrl) { + char log[70] = "find_controller(): pci_memory_controller.name = XXXXXXXXXXXXXXXXXXXX"; + int length = 48; + string_to_charr(controllers[127].name, log, &length); + print_log(log, length); + } if (logflag && log_mem_ctrl) { char log[49] = "find_controller(): controller length = "; @@ -4383,9 +4385,6 @@ void find_controller(void) } // controllers[ctrl.index].setup_ecc(); - - if(1) print_log("4m.bm", 5); - /* Don't enable ECC polling by default unless it has * been well tested. @@ -4393,8 +4392,6 @@ void find_controller(void) // TODO this function contains a variable 'COL_ECC' which is defined nowhere // set_ecc_polling(-1); print_memory_controller(); - - if(1) print_log("5mbm", 4); if(imc_type) { print_dmi_startup_info(); } diff --git a/efi_memtest/memtest86+/dmi.c b/efi_memtest/memtest86+/dmi.c index c6e6e3f..a450de1 100644 --- a/efi_memtest/memtest86+/dmi.c +++ b/efi_memtest/memtest86+/dmi.c @@ -259,7 +259,7 @@ void print_dmi_startup_info(void) char *string2; char *string3; int dmicol = 78; - int slenght; + int slength; int sl1, sl2, sl3; if(!dmi_initialized) { init_dmi(); } @@ -271,13 +271,13 @@ void print_dmi_startup_info(void) string3 = get_tstruct_string(&dmi_cpu_info->header,dmi_cpu_info->cpu_socket); sl3 = mt86_strlen(string3); - slenght = sl1 + sl2; - if(sl3 > 2) { slenght += sl3 + 4; } else { slenght++; } + slength = sl1 + sl2; + if(sl3 > 2) { slength += sl3 + 4; } else { slength++; } if(sl1 && sl2) { - //dmicol -= slenght; // right align - dmicol = 39 - slenght/2; // center align + //dmicol -= slength; // right align + dmicol = 39 - slength/2; // center align cprint(LINE_DMI, dmicol, string1); dmicol += sl1 + 1; cprint(LINE_DMI, dmicol, string2); diff --git a/efi_memtest/memtest86+/efi/memory_tables.c b/efi_memtest/memtest86+/efi/memory_tables.c index fbf4a7f..7087bbc 100644 --- a/efi_memtest/memtest86+/efi/memory_tables.c +++ b/efi_memtest/memtest86+/efi/memory_tables.c @@ -1,4 +1,3 @@ - #include "Uefi.h" #include "Library/UefiLib.h" @@ -32,14 +31,15 @@ const CHAR16 *memory_types[] = int query_memory_table(void) { + if (logflag) { - char log[] = "query_memory_table() started."; - print_log(log, sizeof(log) - 1); + char log[] = "query_memory_table() started."; + print_log(log, sizeof(log) - 1); } int flag = 0; - if(1) { + if(logflag && log_mem_tbl) { char log[23] = "vvqaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -70,7 +70,7 @@ int query_memory_table(void) { if (Status != EFI_SUCCESS) { - if (logflag) { + if (logflag && log_mem_tbl) { char log[32] = "query_memory_table(): Status = "; log[31] = Status + '\0'; print_log(log, sizeof(log)); diff --git a/efi_memtest/memtest86+/main.c b/efi_memtest/memtest86+/main.c index 386e930..437bfb3 100644 --- a/efi_memtest/memtest86+/main.c +++ b/efi_memtest/memtest86+/main.c @@ -441,7 +441,7 @@ void test_start(void) btrace(my_cpu_num, __LINE__, "Begin ", 1, 0, 0); - if(1) { + if(0) { char log[23] = "pllm_upper = "; int length = 13; int_to_charr(vv->plim_upper, log, &length); @@ -452,7 +452,7 @@ void test_start(void) /* Find memory size */ mem_size(); /* must be called before initialise_cpus(); */ - if(1) { + if(0) { char log[23] = "pllm_upper = "; int length = 13; int_to_charr(vv->plim_upper, log, &length); diff --git a/efi_memtest/memtest86+/memsize.c b/efi_memtest/memtest86+/memsize.c index 56f20be..4a83793 100644 --- a/efi_memtest/memtest86+/memsize.c +++ b/efi_memtest/memtest86+/memsize.c @@ -19,6 +19,9 @@ static struct e820entry e820[E820MAX]; static void sort_pmap(void); +extern short logflag; +extern short log_pmap; + /* * Find out how much memory there is. */ @@ -27,7 +30,7 @@ static void sort_pmap(void); void mem_size(void) { - if(1) { + if(logflag && log_pmap) { char log[23] = "vvmaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -55,7 +58,7 @@ void mem_size(void) } } - if(1) { + if(logflag && log_pmap) { char log[23] = "vvmaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -64,21 +67,21 @@ void mem_size(void) get_mem_size(flag, e820_nr, e820); - if(1) { + if(logflag && log_pmap) { char log[23] = "pmap.end = "; int length = 11; int_to_charr(vv->pmap[vv->msegs-1].end, log, &length); print_log(log, length); } - if(1) { + if(logflag && log_pmap) { char log[23] = "msegs = "; int length = 8; int_to_charr(vv->msegs, log, &length); print_log(log, length); } - if(1) { + if(logflag && log_pmap) { char log[23] = "vvmaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -86,7 +89,8 @@ void mem_size(void) } /* Guarantee that pmap entries are in ascending order */ sort_pmap(); - if(1) { + + if(logflag && log_pmap) { char log[23] = "vvmaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -95,37 +99,37 @@ void mem_size(void) vv->plim_lower = 0; vv->plim_upper = vv->pmap[vv->msegs-1].end; - if(1) { + if(logflag && log_pmap) { char log[23] = "pmap.end = "; int length = 11; int_to_charr(vv->pmap[vv->msegs-1].end, log, &length); print_log(log, length); } - if(1) { + if(logflag && log_pmap) { char log[23] = "msegs = "; int length = 8; int_to_charr(vv->msegs, log, &length); print_log(log, length); } - print_pmap(); // TODO remove + if(logflag && log_pmap) print_pmap(); - if(1) { + if(logflag && log_pmap) { char log[23] = "pmap.end = "; int length = 11; int_to_charr(vv->pmap[vv->msegs-1].end, log, &length); print_log(log, length); } - if(1) { + if(logflag && log_pmap) { char log[23] = "msegs = "; int length = 8; int_to_charr(vv->msegs, log, &length); print_log(log, length); } - if(1) { + if(logflag && log_pmap) { char log[23] = "pffm_upper = "; int length = 13; int_to_charr(vv->plim_upper, log, &length); @@ -139,7 +143,7 @@ void mem_size(void) static void sort_pmap(void) { - if(1) { + if(logflag && log_pmap) { char log[23] = "vvpaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); @@ -169,7 +173,7 @@ static void sort_pmap(void) } - if(1) { + if(logflag && log_pmap) { char log[23] = "vvpaddr = "; int length = 10; int_to_charr((ulong)vv, log, &length); diff --git a/efi_memtest/memtest86+/pci.c b/efi_memtest/memtest86+/pci.c index 737f24f..39ac02c 100644 --- a/efi_memtest/memtest86+/pci.c +++ b/efi_memtest/memtest86+/pci.c @@ -16,6 +16,7 @@ #include "logger.h" extern short logflag; +extern short log_pci_conf; #define PCI_CONF_TYPE_NONE 0 #define PCI_CONF_TYPE_1 1 @@ -35,32 +36,32 @@ static unsigned char pci_conf_type = PCI_CONF_TYPE_NONE; int pci_conf_read(unsigned bus, unsigned dev, unsigned fn, unsigned reg, unsigned len, unsigned long *value) { - if (logflag) { - char log[68] = "\npci_conf_read() started.\npci_conf_read(): bus = "; - int length = 48; - int_to_charr(bus, log, &length); - print_log(log, length); + if (logflag && log_pci_conf) { + char log[68] = "\npci_conf_read() started.\npci_conf_read(): bus = "; + int length = 48; + int_to_charr(bus, log, &length); + print_log(log, length); } - if (logflag) { - char log[43] = "pci_conf_read(): dev = "; - int length = 23; - int_to_charr(dev, log, &length); - print_log(log, length); + if (logflag && log_pci_conf) { + char log[43] = "pci_conf_read(): dev = "; + int length = 23; + int_to_charr(dev, log, &length); + print_log(log, length); } - if (logflag) { - char log[42] = "pci_conf_read(): fn = "; - int length = 22; - int_to_charr(fn, log, &length); - print_log(log, length); + if (logflag && log_pci_conf) { + char log[42] = "pci_conf_read(): fn = "; + int length = 22; + int_to_charr(fn, log, &length); + print_log(log, length); } - if (logflag) { - char log[43] = "pci_conf_read(): reg = "; - int length = 23; - int_to_charr(reg, log, &length); - print_log(log, length); + if (logflag && log_pci_conf) { + char log[43] = "pci_conf_read(): reg = "; + int length = 23; + int_to_charr(reg, log, &length); + print_log(log, length); } @@ -96,11 +97,11 @@ int pci_conf_read(unsigned bus, unsigned dev, unsigned fn, unsigned reg, unsigne break; } - if (logflag) { - char log[36] = "pci_conf_read(): result = "; - int length = 26; - int_to_charr(result, log, &length); - print_log(log, length); + if (logflag && log_pci_conf) { + char log[36] = "pci_conf_read(): result = "; + int length = 26; + int_to_charr(result, log, &length); + print_log(log, length); } return result; -- cgit v1.2.3-55-g7522