From 1befb38b868248dda4e84a57aa779f7e8c0b85c0 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Aug 2016 01:23:21 +0200 Subject: x86: Move table csum into separate file We need the checksum function without all the other table functionality soon, so let's split it out into its own C file. Signed-off-by: Alexander Graf Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/tables.h | 2 ++ arch/x86/lib/tables.c | 12 ------------ 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'arch/x86') diff --git a/arch/x86/include/asm/tables.h b/arch/x86/include/asm/tables.h index ae9f0d0d62..81f98f2774 100644 --- a/arch/x86/include/asm/tables.h +++ b/arch/x86/include/asm/tables.h @@ -7,6 +7,8 @@ #ifndef _X86_TABLES_H_ #define _X86_TABLES_H_ +#include + /* * All x86 tables happen to like the address range from 0xf0000 to 0x100000. * We use 0xf0000 as the starting address to store those tables, including diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index f92111e4c8..9ee6b5e924 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -38,18 +38,6 @@ static table_write table_write_funcs[] = { #endif }; -u8 table_compute_checksum(void *v, int len) -{ - u8 *bytes = v; - u8 checksum = 0; - int i; - - for (i = 0; i < len; i++) - checksum -= bytes[i]; - - return checksum; -} - void table_fill_string(char *dest, const char *src, size_t n, char pad) { int start, len; -- cgit v1.2.3 From 4b6dddc294a58fd9010926719e5c907beebf9b4d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Aug 2016 01:23:23 +0200 Subject: x86: Move smbios generation into arch independent directory We will need the SMBIOS generation function on ARM as well going forward, so let's move it into a non arch specific location. Signed-off-by: Alexander Graf Reviewed-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/Kconfig | 27 ----- arch/x86/include/asm/smbios.h | 236 ------------------------------------ arch/x86/lib/Makefile | 1 - arch/x86/lib/smbios.c | 269 ------------------------------------------ arch/x86/lib/tables.c | 2 +- 5 files changed, 1 insertion(+), 534 deletions(-) delete mode 100644 arch/x86/include/asm/smbios.h delete mode 100644 arch/x86/lib/smbios.c (limited to 'arch/x86') diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ac2d598d66..0884af22a7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -461,33 +461,6 @@ config GENERATE_ACPI_TABLE by the operating system. It defines platform-independent interfaces for configuration and power management monitoring. -config GENERATE_SMBIOS_TABLE - bool "Generate an SMBIOS (System Management BIOS) table" - default y - help - The System Management BIOS (SMBIOS) specification addresses how - motherboard and system vendors present management information about - their products in a standard format by extending the BIOS interface - on Intel architecture systems. - - Check http://www.dmtf.org/standards/smbios for details. - -config SMBIOS_MANUFACTURER - string "SMBIOS Manufacturer" - depends on GENERATE_SMBIOS_TABLE - default SYS_VENDOR - help - The board manufacturer to store in SMBIOS structures. - Change this to override the default one (CONFIG_SYS_VENDOR). - -config SMBIOS_PRODUCT_NAME - string "SMBIOS Product Name" - depends on GENERATE_SMBIOS_TABLE - default SYS_BOARD - help - The product name to store in SMBIOS structures. - Change this to override the default one (CONFIG_SYS_BOARD). - endmenu config MAX_PIRQ_LINKS diff --git a/arch/x86/include/asm/smbios.h b/arch/x86/include/asm/smbios.h deleted file mode 100644 index 623a703693..0000000000 --- a/arch/x86/include/asm/smbios.h +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (C) 2015, Bin Meng - * - * Adapted from coreboot src/include/smbios.h - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _SMBIOS_H_ -#define _SMBIOS_H_ - -/* SMBIOS spec version implemented */ -#define SMBIOS_MAJOR_VER 3 -#define SMBIOS_MINOR_VER 0 - -/* SMBIOS structure types */ -enum { - SMBIOS_BIOS_INFORMATION = 0, - SMBIOS_SYSTEM_INFORMATION = 1, - SMBIOS_BOARD_INFORMATION = 2, - SMBIOS_SYSTEM_ENCLOSURE = 3, - SMBIOS_PROCESSOR_INFORMATION = 4, - SMBIOS_CACHE_INFORMATION = 7, - SMBIOS_SYSTEM_SLOTS = 9, - SMBIOS_PHYS_MEMORY_ARRAY = 16, - SMBIOS_MEMORY_DEVICE = 17, - SMBIOS_MEMORY_ARRAY_MAPPED_ADDRESS = 19, - SMBIOS_SYSTEM_BOOT_INFORMATION = 32, - SMBIOS_END_OF_TABLE = 127 -}; - -#define SMBIOS_INTERMEDIATE_OFFSET 16 -#define SMBIOS_STRUCT_EOS_BYTES 2 - -struct __packed smbios_entry { - u8 anchor[4]; - u8 checksum; - u8 length; - u8 major_ver; - u8 minor_ver; - u16 max_struct_size; - u8 entry_point_rev; - u8 formatted_area[5]; - u8 intermediate_anchor[5]; - u8 intermediate_checksum; - u16 struct_table_length; - u32 struct_table_address; - u16 struct_count; - u8 bcd_rev; -}; - -/* BIOS characteristics */ -#define BIOS_CHARACTERISTICS_PCI_SUPPORTED (1 << 7) -#define BIOS_CHARACTERISTICS_UPGRADEABLE (1 << 11) -#define BIOS_CHARACTERISTICS_SELECTABLE_BOOT (1 << 16) - -#define BIOS_CHARACTERISTICS_EXT1_ACPI (1 << 0) -#define BIOS_CHARACTERISTICS_EXT2_TARGET (1 << 2) - -struct __packed smbios_type0 { - u8 type; - u8 length; - u16 handle; - u8 vendor; - u8 bios_ver; - u16 bios_start_segment; - u8 bios_release_date; - u8 bios_rom_size; - u64 bios_characteristics; - u8 bios_characteristics_ext1; - u8 bios_characteristics_ext2; - u8 bios_major_release; - u8 bios_minor_release; - u8 ec_major_release; - u8 ec_minor_release; - char eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -struct __packed smbios_type1 { - u8 type; - u8 length; - u16 handle; - u8 manufacturer; - u8 product_name; - u8 version; - u8 serial_number; - u8 uuid[16]; - u8 wakeup_type; - u8 sku_number; - u8 family; - char eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -#define SMBIOS_BOARD_FEATURE_HOSTING (1 << 0) -#define SMBIOS_BOARD_MOTHERBOARD 10 - -struct __packed smbios_type2 { - u8 type; - u8 length; - u16 handle; - u8 manufacturer; - u8 product_name; - u8 version; - u8 serial_number; - u8 asset_tag_number; - u8 feature_flags; - u8 chassis_location; - u16 chassis_handle; - u8 board_type; - char eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -#define SMBIOS_ENCLOSURE_DESKTOP 3 -#define SMBIOS_STATE_SAFE 3 -#define SMBIOS_SECURITY_NONE 3 - -struct __packed smbios_type3 { - u8 type; - u8 length; - u16 handle; - u8 manufacturer; - u8 chassis_type; - u8 version; - u8 serial_number; - u8 asset_tag_number; - u8 bootup_state; - u8 power_supply_state; - u8 thermal_state; - u8 security_status; - u32 oem_defined; - u8 height; - u8 number_of_power_cords; - u8 element_count; - u8 element_record_length; - char eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -#define SMBIOS_PROCESSOR_TYPE_CENTRAL 3 -#define SMBIOS_PROCESSOR_STATUS_ENABLED 1 -#define SMBIOS_PROCESSOR_UPGRADE_NONE 6 - -struct __packed smbios_type4 { - u8 type; - u8 length; - u16 handle; - u8 socket_designation; - u8 processor_type; - u8 processor_family; - u8 processor_manufacturer; - u32 processor_id[2]; - u8 processor_version; - u8 voltage; - u16 external_clock; - u16 max_speed; - u16 current_speed; - u8 status; - u8 processor_upgrade; - u16 l1_cache_handle; - u16 l2_cache_handle; - u16 l3_cache_handle; - u8 serial_number; - u8 asset_tag; - u8 part_number; - u8 core_count; - u8 core_enabled; - u8 thread_count; - u16 processor_characteristics; - u16 processor_family2; - u16 core_count2; - u16 core_enabled2; - u16 thread_count2; - char eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -struct __packed smbios_type32 { - u8 type; - u8 length; - u16 handle; - u8 reserved[6]; - u8 boot_status; - u8 eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -struct __packed smbios_type127 { - u8 type; - u8 length; - u16 handle; - u8 eos[SMBIOS_STRUCT_EOS_BYTES]; -}; - -struct __packed smbios_header { - u8 type; - u8 length; - u16 handle; -}; - -/** - * fill_smbios_header() - Fill the header of an SMBIOS table - * - * This fills the header of an SMBIOS table structure. - * - * @table: start address of the structure - * @type: the type of structure - * @length: the length of the formatted area of the structure - * @handle: the structure's handle, a unique 16-bit number - */ -static inline void fill_smbios_header(void *table, int type, - int length, int handle) -{ - struct smbios_header *header = table; - - header->type = type; - header->length = length - SMBIOS_STRUCT_EOS_BYTES; - header->handle = handle; -} - -/** - * Function prototype to write a specific type of SMBIOS structure - * - * @addr: start address to write the structure - * @handle: the structure's handle, a unique 16-bit number - * @return: size of the structure - */ -typedef int (*smbios_write_type)(u32 *addr, int handle); - -/** - * write_smbios_table() - Write SMBIOS table - * - * This writes SMBIOS table at a given address. - * - * @addr: start address to write SMBIOS table - * @return: end address of SMBIOS table - */ -u32 write_smbios_table(u32 addr); - -#endif /* _SMBIOS_H_ */ diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index e17f0bb0f2..40ea6bffb7 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -29,7 +29,6 @@ obj-y += relocate.o obj-y += physmem.o obj-$(CONFIG_X86_RAMTEST) += ramtest.o obj-y += sfi.o -obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o obj-y += string.o ifndef CONFIG_QEMU obj-$(CONFIG_GENERATE_ACPI_TABLE) += acpi_table.o diff --git a/arch/x86/lib/smbios.c b/arch/x86/lib/smbios.c deleted file mode 100644 index 9f3055020b..0000000000 --- a/arch/x86/lib/smbios.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) 2015, Bin Meng - * - * Adapted from coreboot src/arch/x86/smbios.c - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include -#include -#include -#include - -DECLARE_GLOBAL_DATA_PTR; - -/** - * smbios_add_string() - add a string to the string area - * - * This adds a string to the string area which is appended directly after - * the formatted portion of an SMBIOS structure. - * - * @start: string area start address - * @str: string to add - * @return: string number in the string area - */ -static int smbios_add_string(char *start, const char *str) -{ - int i = 1; - char *p = start; - - for (;;) { - if (!*p) { - strcpy(p, str); - p += strlen(str); - *p++ = '\0'; - *p++ = '\0'; - - return i; - } - - if (!strcmp(p, str)) - return i; - - p += strlen(p) + 1; - i++; - } -} - -/** - * smbios_string_table_len() - compute the string area size - * - * This computes the size of the string area including the string terminator. - * - * @start: string area start address - * @return: string area size - */ -static int smbios_string_table_len(char *start) -{ - char *p = start; - int i, len = 0; - - while (*p) { - i = strlen(p) + 1; - p += i; - len += i; - } - - return len + 1; -} - -static int smbios_write_type0(u32 *current, int handle) -{ - struct smbios_type0 *t = (struct smbios_type0 *)*current; - int len = sizeof(struct smbios_type0); - - memset(t, 0, sizeof(struct smbios_type0)); - fill_smbios_header(t, SMBIOS_BIOS_INFORMATION, len, handle); - t->vendor = smbios_add_string(t->eos, "U-Boot"); - t->bios_ver = smbios_add_string(t->eos, PLAIN_VERSION); - t->bios_release_date = smbios_add_string(t->eos, U_BOOT_DMI_DATE); - t->bios_rom_size = (CONFIG_ROM_SIZE / 65536) - 1; - t->bios_characteristics = BIOS_CHARACTERISTICS_PCI_SUPPORTED | - BIOS_CHARACTERISTICS_SELECTABLE_BOOT | - BIOS_CHARACTERISTICS_UPGRADEABLE; -#ifdef CONFIG_GENERATE_ACPI_TABLE - t->bios_characteristics_ext1 = BIOS_CHARACTERISTICS_EXT1_ACPI; -#endif - t->bios_characteristics_ext2 = BIOS_CHARACTERISTICS_EXT2_TARGET; - t->bios_major_release = 0xff; - t->bios_minor_release = 0xff; - t->ec_major_release = 0xff; - t->ec_minor_release = 0xff; - - len = t->length + smbios_string_table_len(t->eos); - *current += len; - - return len; -} - -static int smbios_write_type1(u32 *current, int handle) -{ - struct smbios_type1 *t = (struct smbios_type1 *)*current; - int len = sizeof(struct smbios_type1); - - memset(t, 0, sizeof(struct smbios_type1)); - fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle); - t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); - t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME); - - len = t->length + smbios_string_table_len(t->eos); - *current += len; - - return len; -} - -static int smbios_write_type2(u32 *current, int handle) -{ - struct smbios_type2 *t = (struct smbios_type2 *)*current; - int len = sizeof(struct smbios_type2); - - memset(t, 0, sizeof(struct smbios_type2)); - fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle); - t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); - t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME); - t->feature_flags = SMBIOS_BOARD_FEATURE_HOSTING; - t->board_type = SMBIOS_BOARD_MOTHERBOARD; - - len = t->length + smbios_string_table_len(t->eos); - *current += len; - - return len; -} - -static int smbios_write_type3(u32 *current, int handle) -{ - struct smbios_type3 *t = (struct smbios_type3 *)*current; - int len = sizeof(struct smbios_type3); - - memset(t, 0, sizeof(struct smbios_type3)); - fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle); - t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER); - t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP; - t->bootup_state = SMBIOS_STATE_SAFE; - t->power_supply_state = SMBIOS_STATE_SAFE; - t->thermal_state = SMBIOS_STATE_SAFE; - t->security_status = SMBIOS_SECURITY_NONE; - - len = t->length + smbios_string_table_len(t->eos); - *current += len; - - return len; -} - -static int smbios_write_type4(u32 *current, int handle) -{ - struct smbios_type4 *t = (struct smbios_type4 *)*current; - int len = sizeof(struct smbios_type4); - const char *vendor; - char *name; - char processor_name[CPU_MAX_NAME_LEN]; - struct cpuid_result res; - - memset(t, 0, sizeof(struct smbios_type4)); - fill_smbios_header(t, SMBIOS_PROCESSOR_INFORMATION, len, handle); - t->processor_type = SMBIOS_PROCESSOR_TYPE_CENTRAL; - t->processor_family = gd->arch.x86; - vendor = cpu_vendor_name(gd->arch.x86_vendor); - t->processor_manufacturer = smbios_add_string(t->eos, vendor); - res = cpuid(1); - t->processor_id[0] = res.eax; - t->processor_id[1] = res.edx; - name = cpu_get_name(processor_name); - t->processor_version = smbios_add_string(t->eos, name); - t->status = SMBIOS_PROCESSOR_STATUS_ENABLED; - t->processor_upgrade = SMBIOS_PROCESSOR_UPGRADE_NONE; - t->l1_cache_handle = 0xffff; - t->l2_cache_handle = 0xffff; - t->l3_cache_handle = 0xffff; - t->processor_family2 = t->processor_family; - - len = t->length + smbios_string_table_len(t->eos); - *current += len; - - return len; -} - -static int smbios_write_type32(u32 *current, int handle) -{ - struct smbios_type32 *t = (struct smbios_type32 *)*current; - int len = sizeof(struct smbios_type32); - - memset(t, 0, sizeof(struct smbios_type32)); - fill_smbios_header(t, SMBIOS_SYSTEM_BOOT_INFORMATION, len, handle); - - *current += len; - - return len; -} - -static int smbios_write_type127(u32 *current, int handle) -{ - struct smbios_type127 *t = (struct smbios_type127 *)*current; - int len = sizeof(struct smbios_type127); - - memset(t, 0, sizeof(struct smbios_type127)); - fill_smbios_header(t, SMBIOS_END_OF_TABLE, len, handle); - - *current += len; - - return len; -} - -static smbios_write_type smbios_write_funcs[] = { - smbios_write_type0, - smbios_write_type1, - smbios_write_type2, - smbios_write_type3, - smbios_write_type4, - smbios_write_type32, - smbios_write_type127 -}; - -u32 write_smbios_table(u32 addr) -{ - struct smbios_entry *se; - u32 tables; - int len = 0; - int max_struct_size = 0; - int handle = 0; - char *istart; - int isize; - int i; - - /* 16 byte align the table address */ - addr = ALIGN(addr, 16); - - se = (struct smbios_entry *)addr; - memset(se, 0, sizeof(struct smbios_entry)); - - addr += sizeof(struct smbios_entry); - addr = ALIGN(addr, 16); - tables = addr; - - /* populate minimum required tables */ - for (i = 0; i < ARRAY_SIZE(smbios_write_funcs); i++) { - int tmp = smbios_write_funcs[i](&addr, handle++); - max_struct_size = max(max_struct_size, tmp); - len += tmp; - } - - memcpy(se->anchor, "_SM_", 4); - se->length = sizeof(struct smbios_entry); - se->major_ver = SMBIOS_MAJOR_VER; - se->minor_ver = SMBIOS_MINOR_VER; - se->max_struct_size = max_struct_size; - memcpy(se->intermediate_anchor, "_DMI_", 5); - se->struct_table_length = len; - se->struct_table_address = tables; - se->struct_count = handle; - - /* calculate checksums */ - istart = (char *)se + SMBIOS_INTERMEDIATE_OFFSET; - isize = sizeof(struct smbios_entry) - SMBIOS_INTERMEDIATE_OFFSET; - se->intermediate_checksum = table_compute_checksum(istart, isize); - se->checksum = table_compute_checksum(se, sizeof(struct smbios_entry)); - - return addr; -} diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 9ee6b5e924..e62705af41 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -5,9 +5,9 @@ */ #include +#include #include #include -#include #include #include #include -- cgit v1.2.3 From e824cf3fb5857ef452bb84018da854328d816514 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Aug 2016 01:23:25 +0200 Subject: smbios: Allow compilation on 64bit systems The SMBIOS generation code passes pointers as u32. That causes the compiler to warn on casts to pointers. This patch moves all address pointers to uintptr_t instead. Technically u32 would be enough for the current SMBIOS2 style tables, but we may want to extend the code to SMBIOS3 in the future which is 64bit address capable. Signed-off-by: Alexander Graf Reviewed-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/lib/tables.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'arch/x86') diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index e62705af41..025b183d6b 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -12,6 +12,11 @@ #include #include +static u32 write_smbios_table_wrapper(u32 addr) +{ + return write_smbios_table(addr); +} + /** * Function prototype to write a specific configuration table * @@ -34,7 +39,7 @@ static table_write table_write_funcs[] = { write_acpi_tables, #endif #ifdef CONFIG_GENERATE_SMBIOS_TABLE - write_smbios_table, + write_smbios_table_wrapper, #endif }; -- cgit v1.2.3 From 6f192ddcbd8e13351a8f13365e7c714e7b61a79e Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Aug 2016 01:23:26 +0200 Subject: cpu: Add DMTF id and family fields For SMBIOS tables we need to know the CPU family as well as CPU IDs. This patches allocates some space for them in the cpu device and populates it on x86. Signed-off-by: Alexander Graf Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/cpu/cpu_x86.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/x86') diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 09410416a1..39004ee5f0 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -15,9 +15,14 @@ DECLARE_GLOBAL_DATA_PTR; int cpu_x86_bind(struct udevice *dev) { struct cpu_platdata *plat = dev_get_parent_platdata(dev); + struct cpuid_result res; plat->cpu_id = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "intel,apic-id", -1); + plat->family = gd->arch.x86; + res = cpuid(1); + plat->id[0] = res.eax; + plat->id[1] = res.edx; return 0; } -- cgit v1.2.3 From 94eaa79cecf98300974c99d935ff653c9418de21 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Fri, 19 Aug 2016 01:23:27 +0200 Subject: cpu: Add get_vendor callback The CPU udevice already has a few callbacks to retreive information about the currently running CPUs. This patch adds a new get_vendor() call that returns the vendor of the main CPUs. Signed-off-by: Alexander Graf Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/cpu/baytrail/cpu.c | 1 + arch/x86/cpu/broadwell/cpu.c | 1 + arch/x86/cpu/cpu_x86.c | 13 +++++++++++++ arch/x86/cpu/ivybridge/model_206ax.c | 1 + arch/x86/include/asm/cpu_x86.h | 13 +++++++++++++ 5 files changed, 29 insertions(+) (limited to 'arch/x86') diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index 2837709d6d..0bb08524f8 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -189,6 +189,7 @@ static const struct cpu_ops cpu_x86_baytrail_ops = { .get_desc = cpu_x86_get_desc, .get_info = baytrail_get_info, .get_count = baytrail_get_count, + .get_vendor = cpu_x86_get_vendor, }; static const struct udevice_id cpu_x86_baytrail_ids[] = { diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c index 3ba21aacec..6977e86032 100644 --- a/arch/x86/cpu/broadwell/cpu.c +++ b/arch/x86/cpu/broadwell/cpu.c @@ -743,6 +743,7 @@ static const struct cpu_ops cpu_x86_broadwell_ops = { .get_desc = cpu_x86_get_desc, .get_info = broadwell_get_info, .get_count = broadwell_get_count, + .get_vendor = cpu_x86_get_vendor, }; static const struct udevice_id cpu_x86_broadwell_ids[] = { diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 39004ee5f0..157f3de6d8 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -27,6 +27,18 @@ int cpu_x86_bind(struct udevice *dev) return 0; } +int cpu_x86_get_vendor(struct udevice *dev, char *buf, int size) +{ + const char *vendor = cpu_vendor_name(gd->arch.x86_vendor); + + if (size < (strlen(vendor) + 1)) + return -ENOSPC; + + strcpy(buf, vendor); + + return 0; +} + int cpu_x86_get_desc(struct udevice *dev, char *buf, int size) { if (size < CPU_MAX_NAME_LEN) @@ -65,6 +77,7 @@ static int cpu_x86_get_count(struct udevice *dev) static const struct cpu_ops cpu_x86_ops = { .get_desc = cpu_x86_get_desc, .get_count = cpu_x86_get_count, + .get_vendor = cpu_x86_get_vendor, }; static const struct udevice_id cpu_x86_ids[] = { diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index b0743674ff..09b534255c 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -477,6 +477,7 @@ static const struct cpu_ops cpu_x86_model_206ax_ops = { .get_desc = cpu_x86_get_desc, .get_info = model_206ax_get_info, .get_count = model_206ax_get_count, + .get_vendor = cpu_x86_get_vendor, }; static const struct udevice_id cpu_x86_model_206ax_ids[] = { diff --git a/arch/x86/include/asm/cpu_x86.h b/arch/x86/include/asm/cpu_x86.h index 19404805c5..74b82edceb 100644 --- a/arch/x86/include/asm/cpu_x86.h +++ b/arch/x86/include/asm/cpu_x86.h @@ -31,4 +31,17 @@ int cpu_x86_bind(struct udevice *dev); */ int cpu_x86_get_desc(struct udevice *dev, char *buf, int size); +/** + * cpu_x86_get_vendor() - Get a vendor string for an x86 CPU + * + * This uses cpu_vendor_name() and is suitable to use as the get_vendor() + * method for the CPU uclass. + * + * @dev: Device to check (UCLASS_CPU) + * @buf: Buffer to place string + * @size: Size of string space + * @return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error + */ +int cpu_x86_get_vendor(struct udevice *dev, char *buf, int size); + #endif /* _ASM_CPU_X86_H */ -- cgit v1.2.3 From 65e4c0b168651285adeab66f32f3a14668f3e4bd Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 25 Sep 2016 15:27:35 -0600 Subject: x86: efi: Add EFI loader support for x86 Add the required pieces to support the EFI loader on x86. Since U-Boot only builds for 32-bit on x86, only a 32-bit EFI application is supported. If a 64-bit kernel must be booted, U-Boot supports this directly using FIT (see doc/uImage.FIT/kernel.its). U-Boot can act as a payload for both 32-bit and 64-bit EFI. Signed-off-by: Simon Glass Reviewed-by: Bin Meng Signed-off-by: Alexander Graf --- arch/x86/cpu/u-boot.lds | 36 +++++++++++++++++++++++++++++++++++- arch/x86/lib/Makefile | 1 + arch/x86/lib/sections.c | 12 ++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 arch/x86/lib/sections.c (limited to 'arch/x86') diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index 36f59ea96d..cca536b272 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -28,7 +28,10 @@ SECTIONS } . = ALIGN(4); - .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + .rodata : { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + KEEP(*(.rodata.efi.init)); + } . = ALIGN(4); .data : { *(.data*) } @@ -40,6 +43,37 @@ SECTIONS .got : { *(.got*) } . = ALIGN(4); + + .__efi_runtime_start : { + *(.__efi_runtime_start) + } + + .efi_runtime : { + *(efi_runtime_text) + *(efi_runtime_data) + } + + .__efi_runtime_stop : { + *(.__efi_runtime_stop) + } + + .efi_runtime_rel_start : + { + *(.__efi_runtime_rel_start) + } + + .efi_runtime_rel : { + *(.relefi_runtime_text) + *(.relefi_runtime_data) + } + + .efi_runtime_rel_stop : + { + *(.__efi_runtime_rel_stop) + } + + . = ALIGN(4); + __data_end = .; __init_end = .; diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 40ea6bffb7..b9c29226bd 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -28,6 +28,7 @@ obj-y += pirq_routing.o obj-y += relocate.o obj-y += physmem.o obj-$(CONFIG_X86_RAMTEST) += ramtest.o +obj-y += sections.o obj-y += sfi.o obj-y += string.o ifndef CONFIG_QEMU diff --git a/arch/x86/lib/sections.c b/arch/x86/lib/sections.c new file mode 100644 index 0000000000..6455e0f088 --- /dev/null +++ b/arch/x86/lib/sections.c @@ -0,0 +1,12 @@ +/* + * Copyright 2013 Albert ARIBAUD + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +char __efi_runtime_start[0] __attribute__((section(".__efi_runtime_start"))); +char __efi_runtime_stop[0] __attribute__((section(".__efi_runtime_stop"))); +char __efi_runtime_rel_start[0] + __attribute__((section(".__efi_runtime_rel_start"))); +char __efi_runtime_rel_stop[0] + __attribute__((section(".__efi_runtime_rel_stop"))); -- cgit v1.2.3