Linaro-uefi January 2015

linaro-uefi@lists.linaro.org

18 participants
26 discussions

[Patch v2] firmware: dmi_scan: use full dmi version for SMBIOS3

by Ivan Khoronzhuk

New SMBIOS3 spec adds additional field for versioning - docrev. The docrev identifies the revision of a specification implemented in the table structures, so display SMBIOS version > 3 in format, like: 3.22.1 It's not affect on other part of code because version number is analyzed using comparing, and it's obvious that 0x000208 is less than 0x030201 for example. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk(a)linaro.org> --- v1: http://lists.linaro.org/pipermail/linaro-uefi/2015-January/000697.html v2..v1: didn't use additional array drivers/firmware/dmi_scan.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index c5f7b4e..c54982e 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -17,7 +17,7 @@ */ static const char dmi_empty_string[] = " "; -static u16 __initdata dmi_ver; +static u32 dmi_ver __initdata; /* * Catch too early calls to dmi_check_system(): */ @@ -527,7 +527,8 @@ static int __init dmi_smbios3_present(const u8 *buf) { if (memcmp(buf, "_SM3_", 5) == 0 && buf[6] < 32 && dmi_checksum(buf, buf[6])) { - dmi_ver = get_unaligned_be16(buf + 7); + dmi_ver = get_unaligned_be32(buf + 6); + dmi_ver &= 0xFFFFFF; dmi_len = get_unaligned_le32(buf + 12); dmi_base = get_unaligned_le64(buf + 16); @@ -544,8 +545,9 @@ static int __init dmi_smbios3_present(const u8 *buf) dmi_num = dmi_len / 4; if (dmi_walk_early(dmi_decode) == 0) { - pr_info("SMBIOS %d.%d present.\n", - dmi_ver >> 8, dmi_ver & 0xFF); + pr_info("SMBIOS %d.%d.%d present.\n", + dmi_ver >> 16, (dmi_ver >> 8) & 0xFF, + dmi_ver & 0xFF); dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); pr_debug("DMI: %s\n", dmi_ids_string); return 0; -- 1.9.1

9 years, 11 months

[leg-kernel/linux-next] [Patch v2 0/2] firmware: dmi-sysfs: add SMBIOS

by Ivan Khoronzhuk

Some utils, like dmidecode and smbios, needs to access SMBIOS entry table area in order to get information like SMBIOS version, size, etc. Currently it's done via /dev/mem. But for situation when /dev/mem usage is disabled, the utils have to use dmi sysfs instead, which doesn't represent SMBIOS entry. So this patch series adds SMBIOS area to dmi sysfs in order to allow utils in question to work correctly with dmi sysfs. v1: http://lists.linaro.org/pipermail/linaro-uefi/2015-January/000671.html v2..v1: firmware: dmi_scan: add symbol to get SMBIOS entry area - used static array instead of remapping base address - removed extern attribute in header firmware: dmi-sysfs: add SMBIOS entry point area attribute - got SMBIOS table and it's size at init time - moved smbios raw attribute creation after dmi_scan. - read internal array to get SMBIOS table in read funcion - renamed attribute to "smbios_raw_header" instead of smbios_raw Ivan Khoronzhuk (2): firmware: dmi_scan: add symbol to get SMBIOS entry area firmware: dmi-sysfs: add SMBIOS entry point area attribute drivers/firmware/dmi-sysfs.c | 42 ++++++++++++++++++++++++++++++++++++++++++ drivers/firmware/dmi_scan.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/dmi.h | 2 ++ 3 files changed, 78 insertions(+) -- 1.9.1

9 years, 11 months

[leg-kernel/linux-next] [Patch 0/2] firmware: dmi-sysfs: add SMBIOS

by Ivan Khoronzhuk

9 years, 11 months

[PATCH] ArmPlatformPkg: detect correct pl011 fifo depth

by Leif Lindholm

pl011 releases earlier than r1p5 has a fifo depth of 16 bytes, whereas version r1p5 upwards has a fifo depth of 32 bytes. The pl011 driver was hardwired to 32 byte depth, causing dropped characters on some platforms (including default settings on FVP Base and Foundation models). Update driver to select 16 or 32 on port initialization by checking the component revision. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm <leif.lindholm(a)linaro.org> --- ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c | 7 +++++-- ArmPlatformPkg/Include/Drivers/PL011Uart.h | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c index 7e74a05..90a41ab 100644 --- a/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c +++ b/ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.c @@ -50,12 +50,15 @@ PL011UartInitializePort ( LineControl = 0; - // The PL011 supports a buffer of either 1 or 32 chars. Therefore we can accept + // The PL011 supports a buffer of 1, 16 or 32 chars. Therefore we can accept // 1 char buffer as the minimum fifo size. Because everything can be rounded down, // there is no maximum fifo size. if ((*ReceiveFifoDepth == 0) || (*ReceiveFifoDepth >= 32)) { LineControl |= PL011_UARTLCR_H_FEN; - *ReceiveFifoDepth = 32; + if (PL011_UARTPID2_VER(MmioRead32 (UartBase + UARTPID2)) > PL011_VER_R1P4) + *ReceiveFifoDepth = 32; + else + *ReceiveFifoDepth = 16; } else { ASSERT (*ReceiveFifoDepth < 32); // Nothing else to do. 1 byte fifo is default. diff --git a/ArmPlatformPkg/Include/Drivers/PL011Uart.h b/ArmPlatformPkg/Include/Drivers/PL011Uart.h index 6675cef..2fe796f 100644 --- a/ArmPlatformPkg/Include/Drivers/PL011Uart.h +++ b/ArmPlatformPkg/Include/Drivers/PL011Uart.h @@ -35,6 +35,11 @@ #define UARTICR 0x044 #define UARTDMACR 0x048 +#define UARTPID0 0xFE0 +#define UARTPID1 0xFE4 +#define UARTPID2 0xFE8 +#define UARTPID3 0xFEC + // Data status bits #define UART_DATA_ERROR_MASK 0x0F00 @@ -81,6 +86,9 @@ #define PL011_UARTLCR_H_PEN (1 << 1) // Parity Enable #define PL011_UARTLCR_H_BRK (1 << 0) // Send break +#define PL011_UARTPID2_VER(X) (((X) >> 4) & 0xF) +#define PL011_VER_R1P4 0x2 + /* Programmed hardware of Serial port. -- 2.1.4

9 years, 11 months

[PATCH 0/2] firmware: dmi_scan: correct SMBIOS versioning

by Ivan Khoronzhuk

These patches correct dmi version print for BE SoCs and include docrev field of SMBIOS3 to dmi version var. Ivan Khoronzhuk (2): firmware: dmi_scan: correct BE dmi version print firmware: dmi_scan: use full dmi version for SMBIOS3 drivers/firmware/dmi_scan.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) -- 1.9.1

9 years, 11 months

[PATCH] firmware: efi: remove unneeded guid unparse

by Ivan Khoronzhuk

There is no reason to translate guid number to string here. So remove it in order to not do unneeded work. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk(a)linaro.org> --- drivers/firmware/efi/efi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 9035c1b..f6be017 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -272,15 +272,10 @@ static __init int match_config_table(efi_guid_t *guid, unsigned long table, efi_config_table_type_t *table_types) { - u8 str[EFI_VARIABLE_GUID_LEN + 1]; int i; if (table_types) { - efi_guid_unparse(guid, str); - for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) { - efi_guid_unparse(&table_types[i].guid, str); - if (!efi_guidcmp(*guid, table_types[i].guid)) { *(table_types[i].ptr) = table; pr_cont(" %s=0x%lx ", -- 1.9.1

9 years, 11 months

[LIBDMIFS] [PATCH v2] dmifs library initial commit

by Ivan Khoronzhuk

The dmifs library is written to simplify working with dmi sysfs introduced lastly. This is a short library and can be extended by needs. For now it can be used by dmidecode util to extend it's functionality on dmi-sysfs. It's also supports new smbios_raw entry that holds smbios entry structure raw data and can be used to get information like version, size, etc. The dmi structure entries can be accessed by iterating dmi_list or just using pointer on contiguous dmi table which can be taken with dmi_get_raw_data(). To get access to dmifs list it's required to get dmifs table first. To get dmifs table use dmi_get_table(), if table is no more needed put it by dmi_put_table(); Reported-by: Leif Lindholm <leif.lindholm(a)linaro.org> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk(a)linaro.org> --- v1: http://lists.linaro.org/pipermail/linaro-uefi/2015-January/000674.html repo: https://git.linaro.org/people/ivan.khoronzhuk/libdmifs.git v1..v2: libdmifs: - fixed dmifs_is_exist() (missed close_dir) Makefile: - added install target - .gitignore | 5 + Makefile | 28 +++ libdmifs.c | 644 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ libdmifs.h | 56 ++++++ 4 files changed, 733 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 libdmifs.c create mode 100644 libdmifs.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6c08ae0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.o +libdmifs.a +libdmifs.so +tags +cscope* diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..266719d --- /dev/null +++ b/Makefile @@ -0,0 +1,28 @@ +CC=$(CROSS_COMPILE)gcc + +all: libdmifs.so libdmifs.a + +libdmifs.so: libdmifs.o + $(CC) -shared -o libdmifs.so $^ + +libdmifs.a: libdmifs_a.o + ar rv $@ $^ + +libdmifs_a.o: libdmifs.c libdmifs.h + $(CC) -c libdmifs.c -o libdmifs_a.o + +libdmifs.o: libdmifs.c libdmifs.h + $(CC) -fPIC -c libdmifs.c + +install: + cp -f libdmifs.so /usr/lib/ + cp -f libdmifs.a /usr/lib/ + cp -f libdmifs.h /usr/include/ + +clean: + rm -f libdmifs.o libdmifs_a.o libdmifs.so libdmifs.a + +distclean: clean + rm -f cscope.* tags + +.PHONY: all install clean distclean diff --git a/libdmifs.c b/libdmifs.c new file mode 100644 index 0000000..9ad2414 --- /dev/null +++ b/libdmifs.c @@ -0,0 +1,644 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <dirent.h> +#include <unistd.h> +#include <errno.h> +#include <endian.h> +#include "libdmifs.h" + +/* + * maximum number of entries can be calculated based on maximum table + * size and minimum size of structure (4 + 2 NULL symbols). + */ +#define MIN_HEADER_SIZE 4 +#define MIN_DMI_STRUCT_SIZE (MIN_HEADER_SIZE + 2) +#define MAX_ENTRIES_COUNT (~0U/MIN_DMI_STRUCT_SIZE) +#define POSITION_ERR (MAX_ENTRIES_COUNT + 1) + +/* list of dmi entries */ + +/** + * dmilist_insert - inserts new dmi entry to ordered dmi_list, + * sorting according to the position in dmi table + * @dmi_list: pointer on pointer to the first dmi entry in the list + * @new: new entry to be inserted in the ordered dmi_list. + * + * Returns 0 on success and -1 when error. + */ +static int dmilist_insert(struct dmi_entry **dmi_list, struct dmi_entry *new) +{ + struct dmi_entry *old; + struct dmi_entry *cur = *dmi_list; + + if (!cur) { + new->next = NULL; + *dmi_list = new; + return 0; + } + + old = NULL; + while (cur) { + if (cur->position < new->position) { + old = cur; + cur = cur->next; + continue; + } else if (cur->position > new->position) { + if (old) { + old->next = new; + new->next = cur; + return 0; + } + new->next = cur; + *dmi_list = new; + return 0; + } + + fprintf(stderr, "dmitable is broken"); + return -1; + } + + old->next = new; + new->next = NULL; + + return 0; +} + +static void dmilist_free_entry(struct dmi_entry *entry) +{ + free(entry->d_name); + free(entry); +} + +static void dmilist_free(struct dmi_entry **dmi_list) +{ + struct dmi_entry *old; + struct dmi_entry *cur = *dmi_list; + + if (!cur) + return; + + while (cur) { + old = cur; + cur = cur->next; + dmilist_free_entry(old); + } + + *dmi_list = NULL; +} + +/* dmi sysfs attribute reading */ + +/** + * dmi_get_smbios - get smbios data + * @smbios: pointer on array to read raw smbios table in + * + * Returns read data size in bytes on success and 0 when error. + */ +static int dmi_get_smbios(unsigned char *smbios) +{ + FILE *file; + int count = 0; + enum {SMBIOS_SIZE = 32}; + + file = fopen("/sys/firmware/dmi/smbios_raw", "rb"); + if (!file) { + fprintf(stderr, "no \"smbios\" sysfs entry\n"); + return count; + } + + count = fread(smbios, sizeof(char), SMBIOS_SIZE, file); + if (!feof(file)) { + fprintf(stderr, "Error while reading a file\n"); + goto err; + } + +err: + fclose(file); + return count; +} + +/** + * read_position - reads position of dmi entry as it's inside dmi table + * @dir: appropriate directory of dmi entry position + * + * returns dmi entry position in dmi table on success and POSITION_ERR when + * error occurred. + */ +static unsigned int read_position(char *dir) +{ + FILE *file; + char pos[10]; + unsigned int position; + + file = fopen("position", "r"); + if (!file) { + fprintf(stderr, "no \"position\" in \"%s\"\n", dir); + return POSITION_ERR; + } + + if (!fgets(pos, 10, file) && ferror(file)) { + fclose(file); + fprintf(stderr, "Error while working with \"position\" in %s\n", + dir); + return POSITION_ERR; + } + + fclose(file); + + position = strtoul(pos, NULL, 0); + /* position can't be more than number of entries */ + if (position > MAX_ENTRIES_COUNT) { + fprintf(stderr, "position is incorrect %d\n", position); + return POSITION_ERR; + } + + return position; +} + +/** + * read_raw - reads raw data of dmi entry + * @dir: appropriate directory of dmi entry position + * @data: pointer to the array where raw data will be read + * @max_size: maximum data size possible to read + * + * Returns read data size in bytes on success and 0 when error. + * In the same time return value < 6 is also error as at least header is + * 4 bytes in size + 2 NULLs. + */ +static unsigned int read_raw(char *dir, + unsigned char *buf, unsigned int max_size) +{ + FILE *file; + unsigned int count; + unsigned int size = 0; + + file = fopen("raw", "rb"); + if (!file) { + fprintf(stderr, "no \"raw\" in \"%s\"\n", dir); + return 0; + } + + count = fread(buf, sizeof(char), max_size, file); + if (!feof(file)) { + fprintf(stderr, "Error while reading \"raw\" file\n"); + goto err; + } + + if (count < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, "DMI header cannot be less than 4 bytes"); + goto err; + } + + /* check if structure is correct */ + if (buf[count - 1] || buf[count - 2]) { + fprintf(stderr, "Bad raw file of \"%s\"\n", dir); + goto err; + } + + size = count; +err: + fclose(file); + return size; +} + +/** + * add_entry_to_dmilist - generates empty dmi entry and places it to dmi list + * @dmi_list: dmi list where allocated dmi entry will be put + * @dir: the directory name appropriate to dmi entry + * + * Returns 0 on success and -1 on error + */ +static int add_entry_to_dmilist(struct dmi_entry **dmi_list, char *dir) +{ + char *dir_name; + unsigned int position; + struct dmi_entry *entry; + + position = read_position(dir); + if (position == POSITION_ERR) { + fprintf(stderr, + "Cannot read smbios position for \"%s\"\n", dir); + return -1; + } + + dir_name = malloc(strlen(dir) + 1); + if (!dir_name) { + fprintf(stderr, "Cannot allocate memory for dir\n"); + return -1; + } + strcpy(dir_name, dir); + + entry = malloc(sizeof(struct dmi_entry)); + if (!entry) { + fprintf(stderr, "Cannot allocate memory for dmi struct\n"); + free(dir_name); + return -1; + } + + entry->d_name = dir_name; + entry->position = position; + + if (dmilist_insert(dmi_list, entry)) { + fprintf(stderr, "Cannot insert new dmientry in the list"); + dmilist_free_entry(entry); + return -1; + } + + return 0; +} + +/** + * gather_entry_data - reads data from given dmi directory raw attribute end + * binds it with given dmi entry. + * @entry: dmi entry for what data will be read + * @rdata: pointer to array where data will be read in + * @max_size: maximum data size possible to read for now + * + * Returns read raw data size including two NULLs at the end + * On error returns 0 + */ +static unsigned int gather_entry_data(struct dmi_entry *entry, + unsigned char *rdata, + unsigned int max_size) +{ + unsigned int dsize; + + dsize = read_raw(entry->d_name, rdata, max_size); + if (dsize < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, + "Cannot read DMI raw for \"%s\"\n", entry->d_name); + return 0; + } + + entry->h.data = rdata; + entry->h.type = rdata[0]; + entry->h.length = rdata[1]; + entry->h.handle = le16toh(rdata[2] | (rdata[3] << 8)); + + return dsize; +} + +/** + * populate_dmilist - populate dmi entries in dmi list by raw data + * @dmi_list: dmi list with dmi entries to be populated + * @max_size: supposed size of whole dmi table. Can be taken from + * table SMBIOS entry. + * + * Returns dmi raw table size on success, otherwise 0. + */ +static unsigned int populate_dmilist(struct dmi_entry *dmi_list, + unsigned int max_size) +{ + unsigned int dsize; + struct dmi_entry *entry; + unsigned char *raw_table, *tp; + + /* allocate memory for whole dmi table */ + raw_table = malloc(max_size); + if (!raw_table) { + fprintf(stderr, "Cannot allocate memory for DMI table\n"); + return 0; + } + + tp = raw_table; + for (entry = dmi_list; entry; entry = entry->next) { + if (max_size < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, "Max size of DMI table is reached\n"); + goto err; + } + + if (chdir(entry->d_name)) { + fprintf(stderr, "Cannot change dir to %s\n", + entry->d_name); + goto err; + } + + dsize = gather_entry_data(entry, tp, max_size); + if (dsize < MIN_DMI_STRUCT_SIZE) { + if (chdir("../")) + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + if (chdir("../")) { + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + tp += dsize; + max_size -= dsize; + } + + return tp - raw_table; + +err: + fprintf(stderr, "Cannot gather data for dir %s\n", entry->d_name); + free(raw_table); + return 0; +} + +/** + * create_dmilist - creates ordered linked dmi list with empty entries. + * The empty entry is entry with empty dmi header data + * @entry_count: pointer to dmi entry count to be updated while creating. + * + * On success returns dmi_entry pointer on first entry in the list + * Otherwise returns NULL. Updates entry_count. + */ +static struct dmi_entry *create_dmilist(unsigned int *entry_count) +{ + DIR *dmi; + char *cwd; + void *ret = NULL; + struct dirent *dir_entry; + struct dmi_entry *dmi_list = NULL; + + dmi = opendir("."); + if (!dmi) { + fprintf(stderr, "Cannot open cwd\n"); + return ret; + } + + *entry_count = 0; + readdir(dmi); /* miss "." */ + readdir(dmi); /* miss ".." */ + while ((dir_entry = readdir(dmi))) { + if (chdir(dir_entry->d_name)) { + fprintf(stderr, "Cannot change dir to %s\n", + dir_entry->d_name); + goto err; + } + + if (add_entry_to_dmilist(&dmi_list, dir_entry->d_name)) { + fprintf(stderr, "Cannot add \"%s\" to dmi_list\n", + dir_entry->d_name); + if (chdir("../")) + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + if (chdir("../")) { + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + (*entry_count)++; + } + /* now dmilist is complete */ + ret = dmi_list; +err: + if (closedir(dmi)) { + cwd = getcwd(NULL, 1024); + fprintf(stderr, "Cannot close %s", cwd); + free(cwd); + ret = NULL; + } + + if (ret == dmi_list) + return dmi_list; + + dmilist_free(&dmi_list); + return ret; +} + +/** + * dmi_put_dmilist - frees dmi list alloted by dmi_get_dmilist() + * @dmi_list: dmi list to be free + * + * Returns 0 on success, -1 otherwise. + */ +static int dmi_put_dmilist(struct dmi_entry *dmi_list) +{ + unsigned char *raw_table; + + if (!dmi_list) { + fprintf(stderr, "Cannot free dmi_list NULL pointer\n"); + return -1; + } + + raw_table = dmi_list->h.data; + if (!raw_table) { + fprintf(stderr, "Cannot free raw_table NULL pointer\n"); + return -1; + } + + free(raw_table); + dmilist_free(&dmi_list); + + return 0; +} + +/** + * dmi_get_dmilist - creates ordered dmi list with all dmi entries present + * on dmi sysfs. All raw entries data are situated contiguously in the RAM. + * @entry_count: read count of dmi list entries, that's dmi structs in dmi table + * @dmi_size: read whole size in bytes of dmi table. + * @max_size: supposed size of whole dmi table. Can be taken from SMBIOS + * entry point table. + * + * Returns a pointer to first dmi entry in the list. When list is no longer + * needed it has to be freed with dmi_put_dmilist(). + * In case of error returns NULL. + */ +static struct dmi_entry *dmi_get_dmilist(unsigned int *entry_count, + unsigned int *dmi_size, + unsigned int max_size) +{ + char *cwd; + struct dmi_entry *dmi_list = NULL; + char root[] = "/sys/firmware/dmi/entries/"; + + cwd = getcwd(NULL, 1024); + if (!cwd) { + fprintf(stderr, "Cannot get current directory\n"); + return NULL; + } + + if (chdir(root)) { + fprintf(stderr, "Cannot change dir to %s\n", root); + goto err; + } + + /* + * Create dmi_list then fill it in. Do this in two steps to + * have contiguous raw data for whole table + */ + dmi_list = create_dmilist(entry_count); + if (!dmi_list) { + fprintf(stderr, "Cannot create dmi_list\n"); + goto err; + } + + *dmi_size = populate_dmilist(dmi_list, max_size); + if (*dmi_size == 0) { + dmilist_free(&dmi_list); + fprintf(stderr, "Cannot fill in dmi_list by data from raw\n"); + goto err; + } + +err: + if (chdir(cwd)) { + fprintf(stderr, "Cannot change root dir to %s\n", cwd); + dmi_put_dmilist(dmi_list); + dmi_list = NULL; + } + + free(cwd); + return dmi_list; +} + +static int dmi_checksum(unsigned char *buf, unsigned char len) +{ + int i; + unsigned char sum = 0; + + for (i = 0; i < len; i++) + sum += buf[i]; + + return sum == 0; +} + +/** + * dmi_get_expected_size - read dmi table size from SMBIOS entry point table. + * Verify SMBIOS entry point table checksum. + * + * Returns dmi table size read from SMBIOS entry point table. Return 0 on error. + */ +static unsigned int dmi_get_expected_size(unsigned char *smbios) +{ + if (!memcmp(smbios, "_SM3_", 5) && + dmi_checksum(smbios, smbios[0x06])) + return le32toh(smbios[0x0C] | (smbios[0x0D] << 8) | + (smbios[0x0E] << 16) | (smbios[0x0F] << 24)); + else if (!memcmp(smbios, "_SM_", 4) && + dmi_checksum(smbios, smbios[0x05]) && + dmi_checksum(smbios + 0x10, 0x0F)) + return le16toh(smbios[0x16] | (smbios[0x17] << 8)); + else if (!memcmp(smbios, "_DMI_", 5) && + dmi_checksum(smbios, 0x0F)) + return le16toh(smbios[0x06] | (smbios[0x07] << 8)); + + return 0; +} + +/* API */ + +/** + * dmi_get_table - allocate dmi table + * + * Returns pointer on allocated dmi_table struct on success, + * otherwise returns NULL. When table is not needed it has to be + * put by dmi_put_table. + */ +struct dmi_table *dmi_get_table(void) +{ + struct dmi_table *dt; + unsigned int max_dmisize; + + dt = malloc(sizeof(struct dmi_table)); + + if (!dmi_get_smbios(dt->smbios)) + goto err; + + max_dmisize = dmi_get_expected_size(dt->smbios); + if (max_dmisize < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, "SMBIOS entry point is incorrect\n"); + goto err; + } + + dt->dmi_list = dmi_get_dmilist(&dt->dmi_count, + &dt->dmi_size, max_dmisize + 1); + if (!dt->dmi_list) + goto err; + + return dt; + +err: + free(dt); + return NULL; +} + +/** + * dmi_put_table - used in pair with dmi_get_dmitable + * @dt: dmi table pointer taken by dmi_get_table + */ +int dmi_put_table(struct dmi_table *dt) +{ + int ret = -1; + + if (!dt) { + fprintf(stderr, "pointer for DMI table is incorrect\n"); + return ret; + } + + ret = dmi_put_dmilist(dt->dmi_list); + free(dt); + + return ret; +} + +/** + * dmi_get_raw_data - give a pointer to raw dmi table, all raw dmi entries are + * contiguously situated within this memory in original right order. + * @dmi_list: dmi list only taken by dmi_get_dmilist + */ +void *dmi_get_raw_data(struct dmi_entry *dmi_list) +{ + return dmi_list->h.data; +} + +/** + * dmi_get_entry_by_handle - searches an entry in dmi list by given handle + * @dmi_list: dmi list to search for + * @handle: handle to find entry with + * + * Returns entry with given handle on success and NULL otherwise + */ +struct dmi_entry *dmi_get_entry_by_handle(struct dmi_entry *dmi_list, + int handle) +{ + struct dmi_entry *entry; + + for (entry = dmi_list; entry; entry = entry->next) + if (handle == entry->h.handle) + return entry; + + return NULL; +} + +/** + * dmi_get_next_entry_by_type - searches a next entry in dmi list by type + * @dmi_entry: the dmi_entry in dmi list to search beginnig with + * @type: type of dmi entry to find + */ +struct dmi_entry *dmi_get_next_entry_by_type(struct dmi_entry *dmi_entry, + unsigned char type) +{ + struct dmi_entry *entry; + + for (entry = dmi_entry->next; entry; entry = entry->next) + if (type == entry->h.type) + return entry; + + return NULL; +} + +/** + * dmifs_is_exist - checks if dmi sysfs exists + * + * Returns 1 on success and 0 if no + */ +int dmifs_is_exist(void) +{ + int ret; + char dmi_cat[] = "/sys/firmware/dmi/entries/"; + DIR *dmi_dir = opendir(dmi_cat); + + ret = dmi_dir ? 1 : 0; + + if (closedir(dmi_dir)) + fprintf(stderr, "Cannot close %s", dmi_cat); + + return ret; +} diff --git a/libdmifs.h b/libdmifs.h new file mode 100644 index 0000000..218d07f --- /dev/null +++ b/libdmifs.h @@ -0,0 +1,56 @@ +#ifndef LIBDMIFS_H +#define LIBDMIFS_H + +/** + * dmi_hdata - information of dmi entry header + * type: type of dmi entry + * length: length of formated area of dmi entry + * data: pointer to whole raw dmi entry data + */ +struct dmi_hdata { + unsigned char type; + unsigned char length; + unsigned short handle; + unsigned char *data; +}; + +/** + * dmi_entry - holds information about dmi entry + * next: internal in list pointer + * h: dmi header data, including raw data + * position: position within the dmi table + * d_name: dirctory entry name in sysfs + */ +struct dmi_entry { + struct dmi_entry *next; + struct dmi_hdata h; + unsigned int position; + char *d_name; +}; + +/** + * dmi_table - contains whole information about smbios/dmi tables + * @smbios: pointer to raw data of smbios table + * @dmi_count: number of dmi entries in dmi table + * @dmi_size: length of dmi table in bytes + * @dmi_list: single list of dmi table entries, raw data of which contiguously + * situated in memnory. The list can be used to take a pointer to raw data + * of whole dmi table. + */ +struct dmi_table { + unsigned char smbios[32]; + unsigned int dmi_count; + unsigned int dmi_size; + struct dmi_entry *dmi_list; +}; + +int dmifs_is_exist(void); +struct dmi_table *dmi_get_table(void); +int dmi_put_table(struct dmi_table *dt); +void *dmi_get_raw_data(struct dmi_entry *dmi_list); +struct dmi_entry *dmi_get_entry_by_handle(struct dmi_entry *dmi_list, + int handle); +struct dmi_entry *dmi_get_next_entry_by_type(struct dmi_entry *dmi_entry, + unsigned char type); + +#endif -- 1.9.1

9 years, 11 months

[Dmidecode] [Patch 0/4] dmidecode: add dmi sysfs support

by Ivan Khoronzhuk

This series adds dmi sysfs support for dmidecode util. It's needed when access to /dev/mem is forbidden. In this case to get needed information the dmi sysfs can be used. The GIT mirror of CVS dmidecode; https://git.linaro.org/people/ivan.khoronzhuk/dmidecode.git based on master Ivan Khoronzhuk (4): dmidecode: use common function to get SMBIOS version dmidecode: use common function to put SMBIOS in dumpfile dmidecode: move memory map function from dmi_decode dmidecode: add dmi sysfs support Makefile | 2 +- dmidecode.c | 186 ++++++++++++++++++++++++++++++++++++++++-------------------- version.h | 2 +- 3 files changed, 127 insertions(+), 63 deletions(-) -- 1.9.1

9 years, 11 months

[PATCH] dmifs library initial commit

by Ivan Khoronzhuk

The dmifs library is written to simplify working with dmi sysfs introduced lastly. This is a short library and can be extended by needs. For now it can be used by dmidecode util to extend it's functionality on dmi-sysfs. It's also supports new smbios_raw entry that holds smbios entry structure raw data and can be used to get information like version, size, etc. The dmi structure entries can be accessed by iterating dmi_list or just using pointer on contiguous dmi table which can be taken with dmi_get_raw_data(). To get access to dmifs list it's required to get dmifs table first. To get dmifs table use dmi_get_table(), if table is no more needed put it by dmi_put_table(); Reported-by: Leif Lindholm <leif.lindholm(a)linaro.org> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk(a)linaro.org> --- .gitignore | 5 + Makefile | 23 +++ libdmifs.c | 637 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ libdmifs.h | 56 ++++++ 4 files changed, 721 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 libdmifs.c create mode 100644 libdmifs.h diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6c08ae0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.o +libdmifs.a +libdmifs.so +tags +cscope* diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..fe5005b --- /dev/null +++ b/Makefile @@ -0,0 +1,23 @@ +CC=$(CROSS_COMPILE)gcc + +all: libdmifs.so libdmifs.a + +libdmifs.so: libdmifs.o + $(CC) -shared -o libdmifs.so $^ + +libdmifs.a: libdmifs_a.o + ar rv $@ $^ + +libdmifs_a.o: libdmifs.c libdmifs.h + $(CC) -c libdmifs.c -o libdmifs_a.o + +libdmifs.o: libdmifs.c libdmifs.h + $(CC) -fPIC -c libdmifs.c + +clean: + rm -f libdmifs.o libdmifs_a.o libdmifs.so libdmifs.a + +distclean: clean + rm -f cscope.* tags + +.PHONY: all clean distclean diff --git a/libdmifs.c b/libdmifs.c new file mode 100644 index 0000000..b2b990f --- /dev/null +++ b/libdmifs.c @@ -0,0 +1,637 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <dirent.h> +#include <unistd.h> +#include <errno.h> +#include <endian.h> +#include "libdmifs.h" + +/* + * maximum number of entries can be calculated based on maximum table + * size and minimum size of structure (4 + 2 NULL symbols). + */ +#define MIN_HEADER_SIZE 4 +#define MIN_DMI_STRUCT_SIZE (MIN_HEADER_SIZE + 2) +#define MAX_ENTRIES_COUNT (~0U/MIN_DMI_STRUCT_SIZE) +#define POSITION_ERR (MAX_ENTRIES_COUNT + 1) + +/* list of dmi entries */ + +/** + * dmilist_insert - inserts new dmi entry to ordered dmi_list, + * sorting according to the position in dmi table + * @dmi_list: pointer on pointer to the first dmi entry in the list + * @new: new entry to be inserted in the ordered dmi_list. + * + * Returns 0 on success and -1 when error. + */ +static int dmilist_insert(struct dmi_entry **dmi_list, struct dmi_entry *new) +{ + struct dmi_entry *old; + struct dmi_entry *cur = *dmi_list; + + if (!cur) { + new->next = NULL; + *dmi_list = new; + return 0; + } + + old = NULL; + while (cur) { + if (cur->position < new->position) { + old = cur; + cur = cur->next; + continue; + } else if (cur->position > new->position) { + if (old) { + old->next = new; + new->next = cur; + return 0; + } + new->next = cur; + *dmi_list = new; + return 0; + } + + fprintf(stderr, "dmitable is broken"); + return -1; + } + + old->next = new; + new->next = NULL; + + return 0; +} + +static void dmilist_free_entry(struct dmi_entry *entry) +{ + free(entry->d_name); + free(entry); +} + +static void dmilist_free(struct dmi_entry **dmi_list) +{ + struct dmi_entry *old; + struct dmi_entry *cur = *dmi_list; + + if (!cur) + return; + + while (cur) { + old = cur; + cur = cur->next; + dmilist_free_entry(old); + } + + *dmi_list = NULL; +} + +/* dmi sysfs attribute reading */ + +/** + * dmi_get_smbios - get smbios data + * @smbios: pointer on array to read raw smbios table in + * + * Returns read data size in bytes on success and 0 when error. + */ +static int dmi_get_smbios(unsigned char *smbios) +{ + FILE *file; + int count = 0; + enum {SMBIOS_SIZE = 32}; + + file = fopen("/sys/firmware/dmi/smbios_raw", "rb"); + if (!file) { + fprintf(stderr, "no \"smbios\" sysfs entry\n"); + return count; + } + + count = fread(smbios, sizeof(char), SMBIOS_SIZE, file); + if (!feof(file)) { + fprintf(stderr, "Error while reading a file\n"); + goto err; + } + +err: + fclose(file); + return count; +} + +/** + * read_position - reads position of dmi entry as it's inside dmi table + * @dir: appropriate directory of dmi entry position + * + * returns dmi entry position in dmi table on success and POSITION_ERR when + * error occurred. + */ +static unsigned int read_position(char *dir) +{ + FILE *file; + char pos[10]; + unsigned int position; + + file = fopen("position", "r"); + if (!file) { + fprintf(stderr, "no \"position\" in \"%s\"\n", dir); + return POSITION_ERR; + } + + if (!fgets(pos, 10, file) && ferror(file)) { + fclose(file); + fprintf(stderr, "Error while working with \"position\" in %s\n", + dir); + return POSITION_ERR; + } + + fclose(file); + + position = strtoul(pos, NULL, 0); + /* position can't be more than number of entries */ + if (position > MAX_ENTRIES_COUNT) { + fprintf(stderr, "position is incorrect %d\n", position); + return POSITION_ERR; + } + + return position; +} + +/** + * read_raw - reads raw data of dmi entry + * @dir: appropriate directory of dmi entry position + * @data: pointer to the array where raw data will be read + * @max_size: maximum data size possible to read + * + * Returns read data size in bytes on success and 0 when error. + * In the same time return value < 6 is also error as at least header is + * 4 bytes in size + 2 NULLs. + */ +static unsigned int read_raw(char *dir, + unsigned char *buf, unsigned int max_size) +{ + FILE *file; + unsigned int count; + unsigned int size = 0; + + file = fopen("raw", "rb"); + if (!file) { + fprintf(stderr, "no \"raw\" in \"%s\"\n", dir); + return 0; + } + + count = fread(buf, sizeof(char), max_size, file); + if (!feof(file)) { + fprintf(stderr, "Error while reading \"raw\" file\n"); + goto err; + } + + if (count < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, "DMI header cannot be less than 4 bytes"); + goto err; + } + + /* check if structure is correct */ + if (buf[count - 1] || buf[count - 2]) { + fprintf(stderr, "Bad raw file of \"%s\"\n", dir); + goto err; + } + + size = count; +err: + fclose(file); + return size; +} + +/** + * add_entry_to_dmilist - generates empty dmi entry and places it to dmi list + * @dmi_list: dmi list where allocated dmi entry will be put + * @dir: the directory name appropriate to dmi entry + * + * Returns 0 on success and -1 on error + */ +static int add_entry_to_dmilist(struct dmi_entry **dmi_list, char *dir) +{ + char *dir_name; + unsigned int position; + struct dmi_entry *entry; + + position = read_position(dir); + if (position == POSITION_ERR) { + fprintf(stderr, + "Cannot read smbios position for \"%s\"\n", dir); + return -1; + } + + dir_name = malloc(strlen(dir) + 1); + if (!dir_name) { + fprintf(stderr, "Cannot allocate memory for dir\n"); + return -1; + } + strcpy(dir_name, dir); + + entry = malloc(sizeof(struct dmi_entry)); + if (!entry) { + fprintf(stderr, "Cannot allocate memory for dmi struct\n"); + free(dir_name); + return -1; + } + + entry->d_name = dir_name; + entry->position = position; + + if (dmilist_insert(dmi_list, entry)) { + fprintf(stderr, "Cannot insert new dmientry in the list"); + dmilist_free_entry(entry); + return -1; + } + + return 0; +} + +/** + * gather_entry_data - reads data from given dmi directory raw attribute end + * binds it with given dmi entry. + * @entry: dmi entry for what data will be read + * @rdata: pointer to array where data will be read in + * @max_size: maximum data size possible to read for now + * + * Returns read raw data size including two NULLs at the end + * On error returns 0 + */ +static unsigned int gather_entry_data(struct dmi_entry *entry, + unsigned char *rdata, + unsigned int max_size) +{ + unsigned int dsize; + + dsize = read_raw(entry->d_name, rdata, max_size); + if (dsize < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, + "Cannot read DMI raw for \"%s\"\n", entry->d_name); + return 0; + } + + entry->h.data = rdata; + entry->h.type = rdata[0]; + entry->h.length = rdata[1]; + entry->h.handle = le16toh(rdata[2] | (rdata[3] << 8)); + + return dsize; +} + +/** + * populate_dmilist - populate dmi entries in dmi list by raw data + * @dmi_list: dmi list with dmi entries to be populated + * @max_size: supposed size of whole dmi table. Can be taken from + * table SMBIOS entry. + * + * Returns dmi raw table size on success, otherwise 0. + */ +static unsigned int populate_dmilist(struct dmi_entry *dmi_list, + unsigned int max_size) +{ + unsigned int dsize; + struct dmi_entry *entry; + unsigned char *raw_table, *tp; + + /* allocate memory for whole dmi table */ + raw_table = malloc(max_size); + if (!raw_table) { + fprintf(stderr, "Cannot allocate memory for DMI table\n"); + return 0; + } + + tp = raw_table; + for (entry = dmi_list; entry; entry = entry->next) { + if (max_size < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, "Max size of DMI table is reached\n"); + goto err; + } + + if (chdir(entry->d_name)) { + fprintf(stderr, "Cannot change dir to %s\n", + entry->d_name); + goto err; + } + + dsize = gather_entry_data(entry, tp, max_size); + if (dsize < MIN_DMI_STRUCT_SIZE) { + if (chdir("../")) + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + if (chdir("../")) { + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + tp += dsize; + max_size -= dsize; + } + + return tp - raw_table; + +err: + fprintf(stderr, "Cannot gather data for dir %s\n", entry->d_name); + free(raw_table); + return 0; +} + +/** + * create_dmilist - creates ordered linked dmi list with empty entries. + * The empty entry is entry with empty dmi header data + * @entry_count: pointer to dmi entry count to be updated while creating. + * + * On success returns dmi_entry pointer on first entry in the list + * Otherwise returns NULL. Updates entry_count. + */ +static struct dmi_entry *create_dmilist(unsigned int *entry_count) +{ + DIR *dmi; + char *cwd; + void *ret = NULL; + struct dirent *dir_entry; + struct dmi_entry *dmi_list = NULL; + + dmi = opendir("."); + if (!dmi) { + fprintf(stderr, "Cannot open cwd\n"); + return ret; + } + + *entry_count = 0; + readdir(dmi); /* miss "." */ + readdir(dmi); /* miss ".." */ + while ((dir_entry = readdir(dmi))) { + if (chdir(dir_entry->d_name)) { + fprintf(stderr, "Cannot change dir to %s\n", + dir_entry->d_name); + goto err; + } + + if (add_entry_to_dmilist(&dmi_list, dir_entry->d_name)) { + fprintf(stderr, "Cannot add \"%s\" to dmi_list\n", + dir_entry->d_name); + if (chdir("../")) + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + if (chdir("../")) { + fprintf(stderr, "Cannot change dir to ../\n"); + goto err; + } + + (*entry_count)++; + } + /* now dmilist is complete */ + ret = dmi_list; +err: + if (closedir(dmi)) { + cwd = getcwd(NULL, 1024); + fprintf(stderr, "Cannot close %s", cwd); + free(cwd); + ret = NULL; + } + + if (ret == dmi_list) + return dmi_list; + + dmilist_free(&dmi_list); + return ret; +} + +/* API */ + +/** + * dmi_put_dmilist - frees dmi list alloted by dmi_get_dmilist() + * @dmi_list: dmi list to be free + * + * Returns 0 on success, -1 otherwise. + */ +static int dmi_put_dmilist(struct dmi_entry *dmi_list) +{ + unsigned char *raw_table; + + if (!dmi_list) { + fprintf(stderr, "Cannot free dmi_list NULL pointer\n"); + return -1; + } + + raw_table = dmi_list->h.data; + if (!raw_table) { + fprintf(stderr, "Cannot free raw_table NULL pointer\n"); + return -1; + } + + free(raw_table); + dmilist_free(&dmi_list); + + return 0; +} + +/** + * dmi_get_dmilist - creates ordered dmi list with all dmi entries present + * on dmi sysfs. All raw entries data are situated contiguously in the RAM. + * @entry_count: read count of dmi list entries, that's dmi structs in dmi table + * @dmi_size: read whole size in bytes of dmi table. + * @max_size: supposed size of whole dmi table. Can be taken from SMBIOS + * entry point table. + * + * Returns a pointer to first dmi entry in the list. When list is no longer + * needed it has to be freed with dmi_put_dmilist(). + * In case of error returns NULL. + */ +static struct dmi_entry *dmi_get_dmilist(unsigned int *entry_count, + unsigned int *dmi_size, + unsigned int max_size) +{ + char *cwd; + struct dmi_entry *dmi_list = NULL; + char root[] = "/sys/firmware/dmi/entries/"; + + cwd = getcwd(NULL, 1024); + if (!cwd) { + fprintf(stderr, "Cannot get current directory\n"); + return NULL; + } + + if (chdir(root)) { + fprintf(stderr, "Cannot change dir to %s\n", root); + goto err; + } + + /* + * Create dmi_list then fill it in. Do this in two steps to + * have contiguous raw data for whole table + */ + dmi_list = create_dmilist(entry_count); + if (!dmi_list) { + fprintf(stderr, "Cannot create dmi_list\n"); + goto err; + } + + *dmi_size = populate_dmilist(dmi_list, max_size); + if (*dmi_size == 0) { + dmilist_free(&dmi_list); + fprintf(stderr, "Cannot fill in dmi_list by data from raw\n"); + goto err; + } + +err: + if (chdir(cwd)) { + fprintf(stderr, "Cannot change root dir to %s\n", cwd); + dmi_put_dmilist(dmi_list); + dmi_list = NULL; + } + + free(cwd); + return dmi_list; +} + +static int dmi_checksum(unsigned char *buf, unsigned char len) +{ + int i; + unsigned char sum = 0; + + for (i = 0; i < len; i++) + sum += buf[i]; + + return sum == 0; +} + +/** + * dmi_get_expected_size - read dmi table size from SMBIOS entry point table. + * Verify SMBIOS entry point table checksum. + * + * Returns dmi table size read from SMBIOS entry point table. Return 0 on error. + */ +static unsigned int dmi_get_expected_size(unsigned char *smbios) +{ + if (!memcmp(smbios, "_SM3_", 5) && + dmi_checksum(smbios, smbios[0x06])) + return le32toh(smbios[0x0C] | (smbios[0x0D] << 8) | + (smbios[0x0E] << 16) | (smbios[0x0F] << 24)); + else if (!memcmp(smbios, "_SM_", 4) && + dmi_checksum(smbios, smbios[0x05]) && + dmi_checksum(smbios + 0x10, 0x0F)) + return le16toh(smbios[0x16] | (smbios[0x17] << 8)); + else if (!memcmp(smbios, "_DMI_", 5) && + dmi_checksum(smbios, 0x0F)) + return le16toh(smbios[0x06] | (smbios[0x07] << 8)); + + return 0; +} + +/** + * dmi_get_table - allocate dmi table + * + * Returns pointer on allocated dmi_table struct on success, + * otherwise returns NULL. When table is not needed it has to be + * put by dmi_put_table. + */ +struct dmi_table *dmi_get_table(void) +{ + struct dmi_table *dt; + unsigned int max_dmisize; + + dt = malloc(sizeof(struct dmi_table)); + + if (!dmi_get_smbios(dt->smbios)) + goto err; + + max_dmisize = dmi_get_expected_size(dt->smbios); + if (max_dmisize < MIN_DMI_STRUCT_SIZE) { + fprintf(stderr, "SMBIOS entry point is incorrect\n"); + goto err; + } + + dt->dmi_list = dmi_get_dmilist(&dt->dmi_count, + &dt->dmi_size, max_dmisize + 1); + if (!dt->dmi_list) + goto err; + + return dt; + +err: + free(dt); + return NULL; +} + +/** + * dmi_put_table - used in pair with dmi_get_dmitable + * @dt: dmi table pointer taken by dmi_get_table + */ +int dmi_put_table(struct dmi_table *dt) +{ + int ret = -1; + + if (!dt) { + fprintf(stderr, "pointer for DMI table is incorrect\n"); + return ret; + } + + ret = dmi_put_dmilist(dt->dmi_list); + free(dt); + + return ret; +} + +/** + * dmi_get_raw_data - give a pointer to raw dmi table, all raw dmi entries are + * contiguously situated within this memory in original right order. + * @dmi_list: dmi list only taken by dmi_get_dmilist + */ +void *dmi_get_raw_data(struct dmi_entry *dmi_list) +{ + return dmi_list->h.data; +} + +/** + * dmi_get_entry_by_handle - searches an entry in dmi list by given handle + * @dmi_list: dmi list to search for + * @handle: handle to find entry with + * + * Returns entry with given handle on success and NULL otherwise + */ +struct dmi_entry *dmi_get_entry_by_handle(struct dmi_entry *dmi_list, + int handle) +{ + struct dmi_entry *entry; + + for (entry = dmi_list; entry; entry = entry->next) + if (handle == entry->h.handle) + return entry; + + return NULL; +} + +/** + * dmi_get_next_entry_by_type - searches a next entry in dmi list by type + * @dmi_entry: the dmi_entry in dmi list to search beginnig with + * @type: type of dmi entry to find + */ +struct dmi_entry *dmi_get_next_entry_by_type(struct dmi_entry *dmi_entry, + unsigned char type) +{ + struct dmi_entry *entry; + + for (entry = dmi_entry->next; entry; entry = entry->next) + if (type == entry->h.type) + return entry; + + return NULL; +} + +/** + * dmifs_is_exist - checks if dmi sysfs exists + * + * Returns 1 on success and 0 if no + */ +int dmifs_is_exist(void) +{ + DIR *dir = opendir("/sys/firmware/dmi/entries/"); + + return dir ? 1 : 0; +} diff --git a/libdmifs.h b/libdmifs.h new file mode 100644 index 0000000..218d07f --- /dev/null +++ b/libdmifs.h @@ -0,0 +1,56 @@ +#ifndef LIBDMIFS_H +#define LIBDMIFS_H + +/** + * dmi_hdata - information of dmi entry header + * type: type of dmi entry + * length: length of formated area of dmi entry + * data: pointer to whole raw dmi entry data + */ +struct dmi_hdata { + unsigned char type; + unsigned char length; + unsigned short handle; + unsigned char *data; +}; + +/** + * dmi_entry - holds information about dmi entry + * next: internal in list pointer + * h: dmi header data, including raw data + * position: position within the dmi table + * d_name: dirctory entry name in sysfs + */ +struct dmi_entry { + struct dmi_entry *next; + struct dmi_hdata h; + unsigned int position; + char *d_name; +}; + +/** + * dmi_table - contains whole information about smbios/dmi tables + * @smbios: pointer to raw data of smbios table + * @dmi_count: number of dmi entries in dmi table + * @dmi_size: length of dmi table in bytes + * @dmi_list: single list of dmi table entries, raw data of which contiguously + * situated in memnory. The list can be used to take a pointer to raw data + * of whole dmi table. + */ +struct dmi_table { + unsigned char smbios[32]; + unsigned int dmi_count; + unsigned int dmi_size; + struct dmi_entry *dmi_list; +}; + +int dmifs_is_exist(void); +struct dmi_table *dmi_get_table(void); +int dmi_put_table(struct dmi_table *dt); +void *dmi_get_raw_data(struct dmi_entry *dmi_list); +struct dmi_entry *dmi_get_entry_by_handle(struct dmi_entry *dmi_list, + int handle); +struct dmi_entry *dmi_get_next_entry_by_type(struct dmi_entry *dmi_entry, + unsigned char type); + +#endif -- 1.9.1

9 years, 11 months

[PATCH v2 0/5] IntelBds on ARM improvements

by Leif Lindholm

* Resending sinces sourceforge drops emails, and some code updates * The Arm ports support running the IntelBds these days, but still depend on the ArmPkg BdsLib, and pulls in the LinuxLoader. Break minimal subset of BdsLib out into a separate library, and fix up some loose ends causing problems when that happens. Changes since v1: - Added support for running Intel on Juno board - Don't blanket-remove AndroidFastboot support - remove it _and_ LinuxLoader (which is the actual dependency) with another conditional flag. - Fix ArmBdsHelperLib to work also for Juno. Leif Lindholm (5): ARM: conditionalise inclusion of LinuxLoader/AndroidFastboot ArmPkg: break out common Bds functions ArmPkg/ArmPlatformPkg: don't use BdsLib with PlatformIntelBdsLib ArmVirtualizationPkg: don't use BdsLib with PlatformIntelBdsLib and INTEL_BDS ArmPlatformPkg: enable use of IntelBds on Juno ArmPkg/ArmPkg.dsc | 8 + ArmPkg/Include/Library/ArmBdsHelperLib.h | 96 ++++ ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.c | 487 +++++++++++++++++++++ ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.inf | 45 ++ ArmPkg/Library/BdsLib/BdsFilePath.c | 364 +-------------- ArmPkg/Library/BdsLib/BdsHelper.c | 112 ----- ArmPkg/Library/BdsLib/BdsLib.inf | 1 + ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc | 19 + ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf | 6 + .../ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 2 +- .../ArmJunoPkg/Drivers/ArmJunoDxe/InstallFdt.c | 2 +- ArmPlatformPkg/ArmPlatformPkg.dsc | 2 + ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 6 + .../ArmVirtualizationPkg/ArmVirtualization.dsc.inc | 2 + .../ArmVirtualizationPkg/ArmVirtualizationQemu.dsc | 1 + .../PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 +- .../Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 1 + .../PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 +- EmbeddedPkg/EmbeddedPkg.dsc | 2 + 19 files changed, 681 insertions(+), 479 deletions(-) create mode 100644 ArmPkg/Include/Library/ArmBdsHelperLib.h create mode 100644 ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.c create mode 100644 ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.inf -- 2.1.3

9 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Linaro-uefi January 2015