mirror of
https://github.com/memtest86plus/memtest86plus.git
synced 2025-02-16 13:34:45 -06:00
Added preliminary BIOS/EFI SMBIOS table parsing & basic printing (#1)
This commit is contained in:
Sam DEMEULEMEESTER
Sam Demeulemeester
parent
300fd7c1cf
commit
63904403b2
@ -10,6 +10,7 @@
|
||||
#include "io.h"
|
||||
#include "keyboard.h"
|
||||
#include "pmem.h"
|
||||
#include "smbios.h"
|
||||
#include "temperature.h"
|
||||
#include "tsc.h"
|
||||
|
||||
@ -71,9 +72,9 @@ void display_init(void)
|
||||
set_background_colour(WHITE);
|
||||
clear_screen_region(0, 0, 0, 27);
|
||||
#if TESTWORD_WIDTH > 32
|
||||
prints(0, 0, " Memtest86+64 v6.0pre");
|
||||
prints(0, 0, " Memtest86+ v6.00pre (64b)");
|
||||
#else
|
||||
prints(0, 0, " Memtest86+32 v6.0pre");
|
||||
prints(0, 0, " Memtest86+ v6.00pre (32b)");
|
||||
#endif
|
||||
set_foreground_colour(WHITE);
|
||||
set_background_colour(BLUE);
|
||||
@ -135,6 +136,8 @@ void display_init(void)
|
||||
display_memory_size(1024 * ((num_pm_pages + 128) / 256));
|
||||
}
|
||||
|
||||
print_smbios_startup_info();
|
||||
|
||||
scroll_message_row = ROW_SCROLL_T;
|
||||
}
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
#include "test.h"
|
||||
|
||||
#define ROW_MESSAGE_T 10
|
||||
#define ROW_MESSAGE_B (SCREEN_HEIGHT - 2)
|
||||
#define ROW_MESSAGE_B (SCREEN_HEIGHT - 3) // Temp change
|
||||
|
||||
#define ROW_SCROLL_T (ROW_MESSAGE_T + 2)
|
||||
#define ROW_SCROLL_B (SCREEN_HEIGHT - 2)
|
||||
@ -36,7 +36,7 @@
|
||||
prints(0, 30, str)
|
||||
|
||||
#define display_cpu_clk(freq) \
|
||||
printf(1, 10, "%iMHz", freq)
|
||||
printf(1, 10, "%i MHz", freq)
|
||||
|
||||
#define display_cpu_addr_mode(str) \
|
||||
prints(1, 20, str)
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
#include "memsize.h"
|
||||
#include "pci.h"
|
||||
#include "screen.h"
|
||||
#include "smbios.h"
|
||||
#include "smp.h"
|
||||
#include "temperature.h"
|
||||
#include "vmem.h"
|
||||
@ -207,6 +208,8 @@ static void global_init(void)
|
||||
|
||||
pci_init();
|
||||
|
||||
smbios_init();
|
||||
|
||||
badram_init();
|
||||
|
||||
config_init();
|
||||
|
||||
@ -18,6 +18,7 @@ SYS_OBJS = system/cpuid.o \
|
||||
system/pmem.o \
|
||||
system/reloc.o \
|
||||
system/screen.o \
|
||||
system/smbios.o \
|
||||
system/smp.o \
|
||||
system/temperature.o \
|
||||
system/usbhcd.o \
|
||||
|
||||
@ -18,6 +18,7 @@ SYS_OBJS = system/cpuid.o \
|
||||
system/pmem.o \
|
||||
system/reloc.o \
|
||||
system/screen.o \
|
||||
system/smbios.o \
|
||||
system/smp.o \
|
||||
system/temperature.o \
|
||||
system/usbhcd.o \
|
||||
|
||||
273
system/smbios.c
Normal file
273
system/smbios.c
Normal file
@ -0,0 +1,273 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (C) 2022 Samuel Demeulemeester
|
||||
//
|
||||
|
||||
#include <display.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "bootparams.h"
|
||||
#include "efi.h"
|
||||
#include "vmem.h"
|
||||
|
||||
#define LINE_DMI 23
|
||||
|
||||
static const efi_guid_t SMBIOS2_GUID = { 0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d} };
|
||||
|
||||
// SMBIOS v3 compliant FW must include an SMBIOS v2 table, but maybe parse SM3 table later...
|
||||
// static const efi_guid_t SMBIOS3_GUID = { 0xf2fd1544, 0x9794, 0x4a2c, {0x99, 0x2e, 0xe5, 0xbb, 0xcf, 0x20, 0xe3, 0x94} };
|
||||
|
||||
typedef struct {
|
||||
uint8_t anchor[4];
|
||||
int8_t checksum;
|
||||
uint8_t length;
|
||||
uint8_t majorversion;
|
||||
uint8_t minorversion;
|
||||
uint16_t maxstructsize;
|
||||
uint8_t revision;
|
||||
uint8_t pad[5];
|
||||
uint8_t intanchor[5];
|
||||
int8_t intchecksum;
|
||||
uint16_t tablelength;
|
||||
uint32_t tableaddress;
|
||||
uint16_t numstructs;
|
||||
uint8_t SMBIOSrev;
|
||||
} smbios_t;
|
||||
|
||||
struct tstruct_header{
|
||||
uint8_t type;
|
||||
uint8_t length;
|
||||
uint16_t handle;
|
||||
} __attribute__((packed));
|
||||
|
||||
struct cpu_map {
|
||||
struct tstruct_header header;
|
||||
uint8_t cpu_socket;
|
||||
uint8_t cpu_type;
|
||||
uint8_t cpu_family;
|
||||
uint8_t cpu_manufacturer;
|
||||
uint32_t cpu_id;
|
||||
uint8_t cpu_version;
|
||||
uint8_t cpu_voltage;
|
||||
uint16_t ext_clock;
|
||||
uint16_t max_speed;
|
||||
uint16_t cur_speed;
|
||||
uint8_t cpu_status;
|
||||
uint8_t cpu_upgrade;
|
||||
uint16_t l1_handle;
|
||||
uint16_t l2_handle;
|
||||
uint16_t l3_handle;
|
||||
uint8_t cpu_serial;
|
||||
uint8_t cpu_asset_tag;
|
||||
uint8_t cpu_part_number;
|
||||
uint8_t core_count;
|
||||
uint8_t core_enabled;
|
||||
uint8_t thread_count;
|
||||
uint16_t cpu_specs;
|
||||
uint16_t cpu_family_2;
|
||||
} __attribute__((packed));
|
||||
|
||||
struct system_map {
|
||||
struct tstruct_header header;
|
||||
uint8_t manufacturer;
|
||||
uint8_t productname;
|
||||
uint8_t version;
|
||||
uint8_t serialnumber;
|
||||
uint8_t uuidbytes[16];
|
||||
uint8_t wut;
|
||||
} __attribute__((packed));
|
||||
|
||||
|
||||
struct system_map * dmi_system_info;
|
||||
struct cpu_map * dmi_cpu_info;
|
||||
|
||||
char * get_tstruct_string(struct tstruct_header *header, int n){
|
||||
if(n<1)
|
||||
return 0;
|
||||
char * a = (char *)header + header->length;
|
||||
n--;
|
||||
do{
|
||||
if (!*a)
|
||||
n--;
|
||||
if (!n && *a)
|
||||
return a;
|
||||
a++;
|
||||
}while (!(*a==0 && *(a-1)==0));
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef __x86_64__
|
||||
static smbios_t *find_smbios_in_efi64_system_table(efi64_system_table_t *system_table)
|
||||
{
|
||||
efi64_config_table_t *config_tables = (efi64_config_table_t *)map_region(system_table->config_tables, system_table->num_config_tables * sizeof(efi64_config_table_t), true);
|
||||
if (config_tables == NULL) return NULL;
|
||||
|
||||
uintptr_t table_addr = 0;
|
||||
for (uint32_t i = 0; i < system_table->num_config_tables; i++) {
|
||||
if (memcmp(&config_tables[i].guid, &SMBIOS2_GUID, sizeof(efi_guid_t)) == 0) {
|
||||
table_addr = config_tables[i].table;
|
||||
}
|
||||
}
|
||||
return (smbios_t *)table_addr;
|
||||
}
|
||||
#endif
|
||||
|
||||
static smbios_t *find_smbios_in_efi32_system_table(efi32_system_table_t *system_table)
|
||||
{
|
||||
efi32_config_table_t *config_tables = (efi32_config_table_t *)map_region(system_table->config_tables, system_table->num_config_tables * sizeof(efi32_config_table_t), true);
|
||||
if (config_tables == NULL) return NULL;
|
||||
|
||||
uintptr_t table_addr = 0;
|
||||
for (uint32_t i = 0; i < system_table->num_config_tables; i++) {
|
||||
if (memcmp(&config_tables[i].guid, &SMBIOS2_GUID, sizeof(efi_guid_t)) == 0) {
|
||||
table_addr = config_tables[i].table;
|
||||
}
|
||||
}
|
||||
return (smbios_t *)table_addr;
|
||||
}
|
||||
|
||||
static uintptr_t find_smbios_adr(void)
|
||||
{
|
||||
const boot_params_t *boot_params = (boot_params_t *)boot_params_addr;
|
||||
const efi_info_t *efi_info = &boot_params->efi_info;
|
||||
|
||||
smbios_t *rp = NULL;
|
||||
|
||||
if (efi_info->loader_signature == EFI32_LOADER_SIGNATURE) {
|
||||
// EFI32
|
||||
if (rp == NULL && efi_info->loader_signature == EFI32_LOADER_SIGNATURE) {
|
||||
uintptr_t system_table_addr = map_region(efi_info->sys_tab, sizeof(efi32_system_table_t), true);
|
||||
system_table_addr = map_region(system_table_addr, sizeof(efi32_system_table_t), true);
|
||||
if (system_table_addr != 0) {
|
||||
rp = find_smbios_in_efi32_system_table((efi32_system_table_t *)system_table_addr);
|
||||
return (uintptr_t)rp;
|
||||
}
|
||||
}
|
||||
}
|
||||
#ifdef __x86_64__
|
||||
if (rp == NULL && efi_info->loader_signature == EFI64_LOADER_SIGNATURE) {
|
||||
// EFI64
|
||||
if (rp == NULL && efi_info->loader_signature == EFI64_LOADER_SIGNATURE) {
|
||||
uintptr_t system_table_addr = (uintptr_t)efi_info->sys_tab_hi << 32 | (uintptr_t)efi_info->sys_tab;
|
||||
system_table_addr = map_region(system_table_addr, sizeof(efi64_system_table_t), true);
|
||||
if (system_table_addr != 0) {
|
||||
rp = find_smbios_in_efi64_system_table((efi64_system_table_t *)system_table_addr);
|
||||
return (uintptr_t)rp;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (rp == NULL) {
|
||||
// BIOS
|
||||
char *dmi, *dmi_search_start;
|
||||
dmi_search_start = (char *)0x000F0000;
|
||||
|
||||
for(dmi = dmi_search_start; dmi < dmi_search_start + 0xffff0; dmi += 16) {
|
||||
if( *dmi == '_' && *(dmi+1) == 'S' && *(dmi+2) == 'M' && *(dmi+3) == '_')
|
||||
return (uintptr_t)dmi;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int smbios_init(void){
|
||||
|
||||
char *dmi, *dmi_start, *table_start;
|
||||
|
||||
smbios_t *eps;
|
||||
|
||||
int tstruct_count = 0;
|
||||
|
||||
uintptr_t smb_adr;
|
||||
|
||||
// Get SMBIOS Address
|
||||
smb_adr = find_smbios_adr();
|
||||
|
||||
// No Address ? Fail.
|
||||
if(smb_adr == 0)
|
||||
return -1;
|
||||
|
||||
dmi_start = (char *)smb_adr;
|
||||
eps = (smbios_t *)smb_adr;
|
||||
|
||||
// verify checksum
|
||||
int8_t checksum = 0;
|
||||
|
||||
for (; dmi < (dmi_start + eps->length); dmi++)
|
||||
checksum += *dmi;
|
||||
|
||||
if (checksum){
|
||||
return -1;
|
||||
}
|
||||
|
||||
//we need at least revision 2.1 of SMBIOS
|
||||
if ( eps->majorversion < 2 && eps->minorversion < 1 ) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
table_start = (char *)(uintptr_t)eps->tableaddress;
|
||||
dmi = (char *)table_start;
|
||||
|
||||
//look at all structs
|
||||
while(dmi < (table_start + eps->tablelength)){
|
||||
struct tstruct_header *header = (struct tstruct_header *)dmi;
|
||||
|
||||
// MB_SPEC
|
||||
if (header->type == 2)
|
||||
dmi_system_info = (struct system_map *)dmi;
|
||||
|
||||
|
||||
// CPU_SPEC
|
||||
if (header->type == 4)
|
||||
dmi_cpu_info = (struct cpu_map *)dmi;
|
||||
|
||||
dmi += header->length;
|
||||
|
||||
while( ! (*dmi == 0 && *(dmi+1) == 0 ) )
|
||||
dmi++;
|
||||
|
||||
dmi += 2;
|
||||
|
||||
if (++tstruct_count > eps->numstructs)
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void print_smbios_startup_info(void)
|
||||
{
|
||||
|
||||
char *sys_man, *sys_sku, *cpu_socket;
|
||||
|
||||
int slenght, sl1, sl2, sl3, dmicol;
|
||||
|
||||
sys_man = get_tstruct_string(&dmi_system_info->header, dmi_system_info->manufacturer);
|
||||
sl1 = strlen(sys_man);
|
||||
sys_sku = get_tstruct_string(&dmi_system_info->header, dmi_system_info->productname);
|
||||
sl2 = strlen(sys_sku);
|
||||
cpu_socket = get_tstruct_string(&dmi_cpu_info->header, dmi_cpu_info->cpu_socket);
|
||||
sl3 = strlen(cpu_socket);
|
||||
|
||||
slenght = sl1 + sl2;
|
||||
if(sl3 > 2) { slenght += sl3 + 4; } else { slenght++; }
|
||||
|
||||
if(sl1 && sl2)
|
||||
{
|
||||
dmicol = 39 - slenght/2; // center align
|
||||
prints(LINE_DMI, dmicol, sys_man);
|
||||
dmicol += sl1 + 1;
|
||||
prints(LINE_DMI, dmicol, sys_sku);
|
||||
dmicol += sl2 + 1;
|
||||
|
||||
if(sl3 > 2) {
|
||||
printc(LINE_DMI, dmicol, '(');
|
||||
dmicol++;
|
||||
prints(LINE_DMI, dmicol, cpu_socket);
|
||||
dmicol += sl3;
|
||||
printc(LINE_DMI, dmicol, ')');
|
||||
}
|
||||
}
|
||||
}
|
||||
24
system/smbios.h
Normal file
24
system/smbios.h
Normal file
@ -0,0 +1,24 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
#ifndef SMBIOS_H
|
||||
#define SMBIOS_H
|
||||
/**
|
||||
* \file
|
||||
*
|
||||
* Provides functions for reading SMBIOS tables
|
||||
*
|
||||
* Copyright (C) 2004-2022 Samuel Demeulemeester.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Initialize SMBIOS/DMI (locate struct)
|
||||
*/
|
||||
|
||||
int smbios_init(void);
|
||||
|
||||
/**
|
||||
* Print DMI
|
||||
*/
|
||||
|
||||
void print_smbios_startup_info(void);
|
||||
|
||||
#endif // SMBIOS_H
|
||||
Loading…
Reference in New Issue
Block a user