coreboot-gerrit January 2015

coreboot-gerrit@coreboot.org

1 participants
1236 discussions

Patch set updated for coreboot: f517d44 fsp_baytrail: Do the CAR CBMRM transition
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8096 -gerrit commit f517d445d85b52a13fa99a649b60bd1ee36edfe8 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 17:44:35 2015 -0700 fsp_baytrail: Do the CAR CBMRM transition - Add FSP driver routine to find and return a pointer to the saved CAR data. - Add the TEMPORARY_MEMORY_HOB_GUID, used to find the saved CAR data. - Move the cbmem_recovery call from romstage.c into chipset_fsp_util.c so that it's completed by the time we get back to romstage. - Clear area in the stack in early romstage for CBMEM - Remove printk from chipset_prev_sleep_state - this gets called multiple times, including at a point when CBMEM could have been initialized as a console device, but before it's been reinitialized after the CAR->memory transition. Change-Id: Ie3b6797cbcc9bbc6b7c9185a5fc9a85096c40ff6 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/drivers/intel/fsp/fsp_util.c | 25 +++++++++++++++++++++++ src/drivers/intel/fsp/fsp_util.h | 7 +++++++ src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c | 20 +++++++++++++++--- src/soc/intel/fsp_baytrail/romstage/romstage.c | 7 ++----- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/drivers/intel/fsp/fsp_util.c b/src/drivers/intel/fsp/fsp_util.c index d0ed9cf..8f9b7aa 100644 --- a/src/drivers/intel/fsp/fsp_util.c +++ b/src/drivers/intel/fsp/fsp_util.c @@ -177,6 +177,31 @@ volatile u8 * find_fsp () return (fsp_ptr); } +/** finds the saved temporary memory information in the FSP HOB list + * + * @param[in] hob_list_ptr pointer to the start of the hob list + * @param[out] location ptr to ptr gets filled in with stack location + * @param[in] length ptr gets filled in with stack length + * @return 1 if stack was found, 0 if stack was not found + */ +uint8_t find_saved_temp_mem(void *hob_list_ptr, void **location, + uint32_t *length) +{ + EFI_GUID temp_hob_guid = FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID; + + EFI_HOB_GUID_TYPE *saved_mem_hob; + saved_mem_hob = (EFI_HOB_GUID_TYPE *) find_hob_by_guid(hob_list_ptr, + &temp_hob_guid); + + if (saved_mem_hob == NULL) + return 0; + + *length = saved_mem_hob->Header.HobLength; + *location =(void *) ((char *) saved_mem_hob + + sizeof(EFI_HOB_GUID_TYPE)); + return 1; +} + #ifndef __PRE_RAM__ /* Only parse HOB data in ramstage */ void print_fsp_info(void) { diff --git a/src/drivers/intel/fsp/fsp_util.h b/src/drivers/intel/fsp/fsp_util.h index 3c72f24..ff6daca 100644 --- a/src/drivers/intel/fsp/fsp_util.h +++ b/src/drivers/intel/fsp/fsp_util.h @@ -37,6 +37,7 @@ void print_fsp_info(void); void chipset_fsp_early_init(FSP_INIT_PARAMS *FspInitParams, FSP_INFO_HEADER *fsp_ptr); void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr); +uint8_t find_saved_temp_mem(void *hob_list_ptr, void **location, uint32_t *length); /* functions in hob.c */ void print_hob_mem_attributes(void *Hobptr); @@ -124,4 +125,10 @@ extern void *FspHobListPtr; UpdData->member?"Enabled":"Disabled"); \ break; + +#ifndef FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID +#define FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID \ + { 0xbbcff46c, 0xc8d3, 0x4113, { 0x89, 0x85, 0xb9, 0xd4, 0xf3, 0xb3, 0xf6, 0x4e } }; +#endif + #endif /* FSP_UTIL_H */ diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c index c6b5f9c..b645682 100644 --- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c +++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c @@ -34,6 +34,7 @@ #include <baytrail/acpi.h> #include <baytrail/iomap.h> #include <baytrail/smm.h> +#include <arch/early_variables.h> #ifdef __PRE_RAM__ #include <baytrail/romstage.h> @@ -326,12 +327,25 @@ void chipset_fsp_early_init(FSP_INIT_PARAMS *pFspInitParams, } /* The FSP returns here after the fsp_early_init call */ -void ChipsetFspReturnPoint(EFI_STATUS Status, - VOID *HobListPtr) +void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr) { - if (Status == 0xFFFFFFFF) { + void *saved_tmp_mem_location; + uint32_t saved_tmp_mem_length; + + if (Status == 0xFFFFFFFF) warm_reset(); + + /* find the saved temp memory so we can recover cbmem */ + find_saved_temp_mem(HobListPtr, &saved_tmp_mem_location, + &saved_tmp_mem_length); + cbmem_recovery(chipset_prev_sleep_state(0) == 3); + + if (saved_tmp_mem_location != NULL) { + do_car_migrate_variables(saved_tmp_mem_location); + } else { + printk(BIOS_DEBUG, "Skipping CBMEM variable migration.\n"); } + romstage_main_continue(Status, HobListPtr); } diff --git a/src/soc/intel/fsp_baytrail/romstage/romstage.c b/src/soc/intel/fsp_baytrail/romstage/romstage.c index 2619c96..1529850 100644 --- a/src/soc/intel/fsp_baytrail/romstage/romstage.c +++ b/src/soc/intel/fsp_baytrail/romstage/romstage.c @@ -59,9 +59,6 @@ uint32_t chipset_prev_sleep_state(uint32_t clear) pm1_cnt = inl(ACPI_BASE_ADDRESS + PM1_CNT); gen_pmcon1 = read32(PMC_BASE_ADDRESS + GEN_PMCON1); - printk(BIOS_DEBUG, "PM1_STS = 0x%x PM1_CNT = 0x%x GEN_PMCON1 = 0x%x\n", - pm1_sts, pm1_cnt, gen_pmcon1); - if (pm1_sts & WAK_STS) { switch ((pm1_cnt & SLP_TYP) >> SLP_TYP_SHIFT) { #if CONFIG_HAVE_ACPI_RESUME @@ -159,6 +156,8 @@ void main(FSP_INFO_HEADER *fsp_info_header) uint32_t fd_mask = 0; uint32_t fd2_mask = 0; + /* Clear stack area for CBMEM */ + memset((void *)CONFIG_DCACHE_RAM_BASE,0,0x3000); post_code(0x40); program_base_addresses(); @@ -215,7 +214,6 @@ void main(FSP_INFO_HEADER *fsp_info_header) * Memory is setup and the stack is set by the FSP. */ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) { - int cbmem_was_initted; void *cbmem_hob_ptr; uint32_t prev_sleep_state; struct romstage_handoff *handoff; @@ -258,7 +256,6 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) { post_code(0x4d); } - cbmem_was_initted = !cbmem_recovery(prev_sleep_state == 3); /* Save the HOB pointer in CBMEM to be used in ramstage*/ cbmem_hob_ptr = cbmem_add (CBMEM_ID_HOB_POINTER, sizeof(*hob_list_ptr));

1 0

Patch set updated for coreboot: ae055f5 cbmem: make do_car_migrate_variables external, add pointer
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8095 -gerrit commit ae055f51f30303a2700e4656eab45271791b66fb Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 11:23:13 2015 -0700 cbmem: make do_car_migrate_variables external, add pointer This is for the FSP migration. The pointer to the saved CAR data needs to be passed in for the car migration. Instead of creating special functions just for the FSP, or changing everything to pass the pointer all the way through from cbmem_recovery(), keep the BROKEN_CAR_MIGRATE in place for FSP platforms so that do_car_migrate_variables doesn't get called in the standard cbmem_recovery() path. After it returns, call do_car_migrate_variables() directly, passing in the pointer to the saved data. Change-Id: I4967eef097bf41b033ab82fafd1fd0d4144fd5d2 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/arch/arm/include/arch/early_variables.h | 1 + src/arch/arm64/include/arch/early_variables.h | 1 + src/arch/riscv/include/arch/early_variables.h | 1 + src/arch/x86/include/arch/early_variables.h | 2 ++ src/cpu/x86/car.c | 9 ++++++--- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/arch/arm/include/arch/early_variables.h b/src/arch/arm/include/arch/early_variables.h index 5b58baa..edddc7c 100644 --- a/src/arch/arm/include/arch/early_variables.h +++ b/src/arch/arm/include/arch/early_variables.h @@ -27,5 +27,6 @@ static inline void *car_get_var_ptr(void *var) { return var; } #define car_get_var(var) (var) #define car_set_var(var, val) do { (var) = (val); } while (0) static inline void car_migrate_variables(void) { } +static inline void do_car_migrate_variables(void *var) { } #endif diff --git a/src/arch/arm64/include/arch/early_variables.h b/src/arch/arm64/include/arch/early_variables.h index 3d9fa26..779515a 100644 --- a/src/arch/arm64/include/arch/early_variables.h +++ b/src/arch/arm64/include/arch/early_variables.h @@ -31,5 +31,6 @@ static inline void *car_get_var_ptr(void *var) { return var; } #define car_get_var(var) (var) #define car_set_var(var, val) do { (var) = (val); } while (0) static inline void car_migrate_variables(void) { } +static inline void do_car_migrate_variables(void *var) { } #endif diff --git a/src/arch/riscv/include/arch/early_variables.h b/src/arch/riscv/include/arch/early_variables.h index 3a1f20d..2487c82 100644 --- a/src/arch/riscv/include/arch/early_variables.h +++ b/src/arch/riscv/include/arch/early_variables.h @@ -31,5 +31,6 @@ static inline void *car_get_var_ptr(void *var) { return var; } #define car_get_var(var) (var) #define car_set_var(var, val) do { (var) = (val); } while (0) static inline void car_migrate_variables(void) { } +static inline void do_car_migrate_variables(void *var) { } #endif diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index f76c048..fbbbc6b 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -55,8 +55,10 @@ static inline void *car_get_var_ptr(void *var) { return var; } #if defined(__PRE_RAM__) && IS_ENABLED(CONFIG_CACHE_AS_RAM) /* Migrate the CAR variables to memory. */ void car_migrate_variables(void); +void do_car_migrate_variables(void *var); #else static inline void car_migrate_variables(void) { } +static inline void do_car_migrate_variables(void *var) { } #endif #endif diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index c9cc6d6..eb04d0c 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -73,7 +73,7 @@ void *car_get_var_ptr(void *var) return &migrated_base[offset]; } -static void do_car_migrate_variables(void) +void do_car_migrate_variables(void * saved_car) { void *migrated_base; car_migration_func_t *migrate_func; @@ -90,7 +90,10 @@ static void do_car_migrate_variables(void) return; } - memcpy(migrated_base, &_car_data_start[0], car_data_size); + if (saved_car == NULL) + memcpy(migrated_base, &_car_data_start[0], car_data_size); + else + memcpy(migrated_base, saved_car, car_data_size); /* Mark that the data has been moved. */ car_migrated = ~0; @@ -106,5 +109,5 @@ static void do_car_migrate_variables(void) void car_migrate_variables(void) { if (!IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE)) - do_car_migrate_variables(); + do_car_migrate_variables(NULL); }

1 0

Patch set updated for coreboot: 93a791c drivers/intel/fsp: split the UEFI HOB functions into hob.c
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8065 -gerrit commit 93a791c1827771d6938e44cd717d875340f7e23a Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sat Jan 3 07:28:39 2015 -0700 drivers/intel/fsp: split the UEFI HOB functions into hob.c The FSP uses a lot of UEFI HOB (Hand Off Block) functions for reporting and passing information to coreboot. These seem to me like they should be in their own file, so I'm splitting them out of fsp_util.c. I'll be adding a couple more functions in the next patch. These functions should all be compliant to the Hand Off Block spec. Change-Id: Ie8bbc0a9277b9484f13dd077b3a52e424a8600fe Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/drivers/intel/fsp/Makefile.inc | 5 +- src/drivers/intel/fsp/fsp_util.c | 144 ------------------------------- src/drivers/intel/fsp/fsp_util.h | 8 +- src/drivers/intel/fsp/hob.c | 172 +++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 148 deletions(-) diff --git a/src/drivers/intel/fsp/Makefile.inc b/src/drivers/intel/fsp/Makefile.inc index 280f7b9..7e79c08 100644 --- a/src/drivers/intel/fsp/Makefile.inc +++ b/src/drivers/intel/fsp/Makefile.inc @@ -17,8 +17,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -ramstage-y += fsp_util.c -romstage-y += fsp_util.c +ramstage-y += fsp_util.c hob.c +romstage-y += fsp_util.c hob.c + ramstage-$(CONFIG_ENABLE_MRC_CACHE) += fastboot_cache.c romstage-$(CONFIG_ENABLE_MRC_CACHE) += fastboot_cache.c diff --git a/src/drivers/intel/fsp/fsp_util.c b/src/drivers/intel/fsp/fsp_util.c index 3e3f727..d0ed9cf 100644 --- a/src/drivers/intel/fsp/fsp_util.c +++ b/src/drivers/intel/fsp/fsp_util.c @@ -199,150 +199,6 @@ void print_fsp_info(void) { (u8)(fsp_header_ptr->ImageRevision & 0xff)); } -static void print_hob_mem_attributes(void *Hobptr) { - EFI_HOB_MEMORY_ALLOCATION *HobMemoryPtr = (EFI_HOB_MEMORY_ALLOCATION *)Hobptr; - EFI_MEMORY_TYPE Hobmemtype = HobMemoryPtr->AllocDescriptor.MemoryType; - u64 Hobmemaddr = HobMemoryPtr->AllocDescriptor.MemoryBaseAddress; - u64 Hobmemlength = HobMemoryPtr->AllocDescriptor.MemoryLength; - const char * Hobmemtypenames[15]; - - Hobmemtypenames[0] = "EfiReservedMemoryType"; - Hobmemtypenames[1] = "EfiLoaderCode"; - Hobmemtypenames[2] = "EfiLoaderData"; - Hobmemtypenames[3] = "EfiBootServicesCode"; - Hobmemtypenames[4] = "EfiBootServicesData"; - Hobmemtypenames[5] = "EfiRuntimeServicesCode"; - Hobmemtypenames[6] = "EfiRuntimeServicesData"; - Hobmemtypenames[7] = "EfiConventionalMemory"; - Hobmemtypenames[8] = "EfiUnusableMemory"; - Hobmemtypenames[9] = "EfiACPIReclaimMemory"; - Hobmemtypenames[10] = "EfiACPIMemoryNVS"; - Hobmemtypenames[11] = "EfiMemoryMappedIO"; - Hobmemtypenames[12] = "EfiMemoryMappedIOPortSpace"; - Hobmemtypenames[13] = "EfiPalCode"; - Hobmemtypenames[14] = "EfiMaxMemoryType"; - - printk(BIOS_SPEW, " Memory type %s (0x%x)\n", - Hobmemtypenames[(u32)Hobmemtype], (u32) Hobmemtype); - printk(BIOS_SPEW, " at location 0x%0lx with length 0x%0lx\n", - (unsigned long)Hobmemaddr, (unsigned long)Hobmemlength); -} - -static void print_hob_resource_attributes(void *Hobptr) { - EFI_HOB_RESOURCE_DESCRIPTOR *HobResourcePtr = - (EFI_HOB_RESOURCE_DESCRIPTOR *)Hobptr; - u32 Hobrestype = HobResourcePtr->ResourceType; - u32 Hobresattr = HobResourcePtr->ResourceAttribute; - u64 Hobresaddr = HobResourcePtr->PhysicalStart; - u64 Hobreslength = HobResourcePtr->ResourceLength; - const char *Hobrestypestr = NULL; - - // HOB Resource Types - switch (Hobrestype) { - case EFI_RESOURCE_SYSTEM_MEMORY: - Hobrestypestr = "EFI_RESOURCE_SYSTEM_MEMORY"; break; - case EFI_RESOURCE_MEMORY_MAPPED_IO: - Hobrestypestr = "EFI_RESOURCE_MEMORY_MAPPED_IO"; break; - case EFI_RESOURCE_IO: - Hobrestypestr = "EFI_RESOURCE_IO"; break; - case EFI_RESOURCE_FIRMWARE_DEVICE: - Hobrestypestr = "EFI_RESOURCE_FIRMWARE_DEVICE"; break; - case EFI_RESOURCE_MEMORY_MAPPED_IO_PORT: - Hobrestypestr = "EFI_RESOURCE_MEMORY_MAPPED_IO_PORT"; break; - case EFI_RESOURCE_MEMORY_RESERVED: - Hobrestypestr = "EFI_RESOURCE_MEMORY_RESERVED"; break; - case EFI_RESOURCE_IO_RESERVED: - Hobrestypestr = "EFI_RESOURCE_IO_RESERVED"; break; - case EFI_RESOURCE_MAX_MEMORY_TYPE: - Hobrestypestr = "EFI_RESOURCE_MAX_MEMORY_TYPE"; break; - default: - Hobrestypestr = "EFI_RESOURCE_UNKNOWN"; break; - } - - printk(BIOS_SPEW, " Resource %s (0x%0x) has attributes 0x%0x\n", - Hobrestypestr, Hobrestype, Hobresattr); - printk(BIOS_SPEW, " at location 0x%0lx with length 0x%0lx\n", - (unsigned long)Hobresaddr, (unsigned long)Hobreslength); -} - -static const char * get_hob_type_string(void *Hobptr) { - EFI_HOB_GENERIC_HEADER *HobHeaderPtr = (EFI_HOB_GENERIC_HEADER *)Hobptr; - u16 Hobtype = HobHeaderPtr->HobType; - const char *Hobtypestring = NULL; - - switch (Hobtype) { - case EFI_HOB_TYPE_HANDOFF: - Hobtypestring = "EFI_HOB_TYPE_HANDOFF"; break; - case EFI_HOB_TYPE_MEMORY_ALLOCATION: - Hobtypestring = "EFI_HOB_TYPE_MEMORY_ALLOCATION"; break; - case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR: - Hobtypestring = "EFI_HOB_TYPE_RESOURCE_DESCRIPTOR"; break; - case EFI_HOB_TYPE_GUID_EXTENSION: - Hobtypestring = "EFI_HOB_TYPE_GUID_EXTENSION"; break; - case EFI_HOB_TYPE_MEMORY_POOL: - Hobtypestring = "EFI_HOB_TYPE_MEMORY_POOL"; break; - case EFI_HOB_TYPE_UNUSED: - Hobtypestring = "EFI_HOB_TYPE_UNUSED"; break; - case EFI_HOB_TYPE_END_OF_HOB_LIST: - Hobtypestring = "EFI_HOB_TYPE_END_OF_HOB_LIST"; break; - default: - Hobtypestring = "EFI_HOB_TYPE_UNRECOGNIZED"; break; - } - - return Hobtypestring; -} - -/* Print out a structure of all the HOBs - * that match a certain type: - * Print all types (0x0000) - * EFI_HOB_TYPE_HANDOFF (0x0001) - * EFI_HOB_TYPE_MEMORY_ALLOCATION (0x0002) - * EFI_HOB_TYPE_RESOURCE_DESCRIPTOR (0x0003) - * EFI_HOB_TYPE_GUID_EXTENSION (0x0004) - * EFI_HOB_TYPE_MEMORY_POOL (0x0007) - * EFI_HOB_TYPE_UNUSED (0xFFFE) - * EFI_HOB_TYPE_END_OF_HOB_LIST (0xFFFF) - */ -void print_hob_type_structure(u16 Hobtype, void *Hoblistptr) { - u32 *Currenthob; - u32 *Nexthob = 0; - u8 Lasthob = 0; - u32 Currenttype; - const char *Currenttypestr; - - Currenthob = Hoblistptr; - - /* Print out HOBs of our desired type until - * the end of the HOB list - */ - printk(BIOS_DEBUG, "\n=== FSP HOB Data Structure ===\n"); - printk(BIOS_DEBUG, "FSP Hoblistptr: 0x%0x\n", - (u32) Hoblistptr); - do { - EFI_HOB_GENERIC_HEADER *CurrentHeaderPtr = - (EFI_HOB_GENERIC_HEADER *)Currenthob; - Currenttype = CurrentHeaderPtr->HobType; /* Get the type of this HOB */ - Currenttypestr = get_hob_type_string(Currenthob); - - if (Currenttype == Hobtype || Hobtype == 0x0000) { - printk(BIOS_DEBUG, "HOB 0x%0x is an %s (type 0x%0x)\n", - (u32) Currenthob, Currenttypestr, Currenttype); - switch (Currenttype) { - case EFI_HOB_TYPE_MEMORY_ALLOCATION: - print_hob_mem_attributes(Currenthob); break; - case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR: - print_hob_resource_attributes(Currenthob); break; - } - } - - Lasthob = END_OF_HOB_LIST(Currenthob); /* Check for end of HOB list */ - if (!Lasthob) { - Nexthob = GET_NEXT_HOB(Currenthob); /* Get next HOB pointer */ - Currenthob = Nexthob; // Start on next HOB - } - } while (!Lasthob); - printk(BIOS_DEBUG, "=== End of FSP HOB Data Structure ===\n\n"); -} #if IS_ENABLED(CONFIG_ENABLE_MRC_CACHE) /** diff --git a/src/drivers/intel/fsp/fsp_util.h b/src/drivers/intel/fsp/fsp_util.h index 64a5e7f..cb667dc 100644 --- a/src/drivers/intel/fsp/fsp_util.h +++ b/src/drivers/intel/fsp/fsp_util.h @@ -32,14 +32,18 @@ volatile u8 * find_fsp (void); void fsp_early_init(FSP_INFO_HEADER *fsp_info); void FspNotify(u32 Phase); void FspNotifyReturnPoint(EFI_STATUS Status, VOID *HobListPtr); -void print_hob_type_structure(u16 Hobtype, void *Hoblistptr); void romstage_fsp_rt_buffer_callback(FSP_INIT_RT_BUFFER *FspRtBuffer); void print_fsp_info(void); - void chipset_fsp_early_init(FSP_INIT_PARAMS *FspInitParams, FSP_INFO_HEADER *fsp_ptr); void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr); +/* functions in hob.c */ +void print_hob_mem_attributes(void *Hobptr); +void print_hob_type_structure(u16 Hobtype, void *Hoblistptr); +void print_hob_resource_attributes(void *Hobptr); +const char * get_hob_type_string(void *Hobptr); + /* Additional HOB types not included in the FSP: * #define EFI_HOB_TYPE_HANDOFF 0x0001 * #define EFI_HOB_TYPE_MEMORY_ALLOCATION 0x0002 diff --git a/src/drivers/intel/fsp/hob.c b/src/drivers/intel/fsp/hob.c new file mode 100644 index 0000000..4537ffb --- /dev/null +++ b/src/drivers/intel/fsp/hob.c @@ -0,0 +1,172 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013-2014 Sage Electronic Engineering, LLC. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <types.h> +#include <string.h> +#include <console/console.h> +#include "fsp_util.h" + +void print_hob_mem_attributes(void *Hobptr) +{ + EFI_HOB_MEMORY_ALLOCATION *HobMemoryPtr = (EFI_HOB_MEMORY_ALLOCATION *)Hobptr; + EFI_MEMORY_TYPE Hobmemtype = HobMemoryPtr->AllocDescriptor.MemoryType; + u64 Hobmemaddr = HobMemoryPtr->AllocDescriptor.MemoryBaseAddress; + u64 Hobmemlength = HobMemoryPtr->AllocDescriptor.MemoryLength; + const char * Hobmemtypenames[15]; + + Hobmemtypenames[0] = "EfiReservedMemoryType"; + Hobmemtypenames[1] = "EfiLoaderCode"; + Hobmemtypenames[2] = "EfiLoaderData"; + Hobmemtypenames[3] = "EfiBootServicesCode"; + Hobmemtypenames[4] = "EfiBootServicesData"; + Hobmemtypenames[5] = "EfiRuntimeServicesCode"; + Hobmemtypenames[6] = "EfiRuntimeServicesData"; + Hobmemtypenames[7] = "EfiConventionalMemory"; + Hobmemtypenames[8] = "EfiUnusableMemory"; + Hobmemtypenames[9] = "EfiACPIReclaimMemory"; + Hobmemtypenames[10] = "EfiACPIMemoryNVS"; + Hobmemtypenames[11] = "EfiMemoryMappedIO"; + Hobmemtypenames[12] = "EfiMemoryMappedIOPortSpace"; + Hobmemtypenames[13] = "EfiPalCode"; + Hobmemtypenames[14] = "EfiMaxMemoryType"; + + printk(BIOS_SPEW, " Memory type %s (0x%x)\n", + Hobmemtypenames[(u32)Hobmemtype], (u32) Hobmemtype); + printk(BIOS_SPEW, " at location 0x%0lx with length 0x%0lx\n", + (unsigned long)Hobmemaddr, (unsigned long)Hobmemlength); +} + +void print_hob_resource_attributes(void *Hobptr) +{ + EFI_HOB_RESOURCE_DESCRIPTOR *HobResourcePtr = + (EFI_HOB_RESOURCE_DESCRIPTOR *)Hobptr; + u32 Hobrestype = HobResourcePtr->ResourceType; + u32 Hobresattr = HobResourcePtr->ResourceAttribute; + u64 Hobresaddr = HobResourcePtr->PhysicalStart; + u64 Hobreslength = HobResourcePtr->ResourceLength; + const char *Hobrestypestr = NULL; + + // HOB Resource Types + switch (Hobrestype) { + case EFI_RESOURCE_SYSTEM_MEMORY: + Hobrestypestr = "EFI_RESOURCE_SYSTEM_MEMORY"; break; + case EFI_RESOURCE_MEMORY_MAPPED_IO: + Hobrestypestr = "EFI_RESOURCE_MEMORY_MAPPED_IO"; break; + case EFI_RESOURCE_IO: + Hobrestypestr = "EFI_RESOURCE_IO"; break; + case EFI_RESOURCE_FIRMWARE_DEVICE: + Hobrestypestr = "EFI_RESOURCE_FIRMWARE_DEVICE"; break; + case EFI_RESOURCE_MEMORY_MAPPED_IO_PORT: + Hobrestypestr = "EFI_RESOURCE_MEMORY_MAPPED_IO_PORT"; break; + case EFI_RESOURCE_MEMORY_RESERVED: + Hobrestypestr = "EFI_RESOURCE_MEMORY_RESERVED"; break; + case EFI_RESOURCE_IO_RESERVED: + Hobrestypestr = "EFI_RESOURCE_IO_RESERVED"; break; + case EFI_RESOURCE_MAX_MEMORY_TYPE: + Hobrestypestr = "EFI_RESOURCE_MAX_MEMORY_TYPE"; break; + default: + Hobrestypestr = "EFI_RESOURCE_UNKNOWN"; break; + } + + printk(BIOS_SPEW, " Resource %s (0x%0x) has attributes 0x%0x\n", + Hobrestypestr, Hobrestype, Hobresattr); + printk(BIOS_SPEW, " at location 0x%0lx with length 0x%0lx\n", + (unsigned long)Hobresaddr, (unsigned long)Hobreslength); +} + +const char * get_hob_type_string(void *Hobptr) +{ + EFI_HOB_GENERIC_HEADER *HobHeaderPtr = (EFI_HOB_GENERIC_HEADER *)Hobptr; + u16 Hobtype = HobHeaderPtr->HobType; + const char *Hobtypestring = NULL; + + switch (Hobtype) { + case EFI_HOB_TYPE_HANDOFF: + Hobtypestring = "EFI_HOB_TYPE_HANDOFF"; break; + case EFI_HOB_TYPE_MEMORY_ALLOCATION: + Hobtypestring = "EFI_HOB_TYPE_MEMORY_ALLOCATION"; break; + case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR: + Hobtypestring = "EFI_HOB_TYPE_RESOURCE_DESCRIPTOR"; break; + case EFI_HOB_TYPE_GUID_EXTENSION: + Hobtypestring = "EFI_HOB_TYPE_GUID_EXTENSION"; break; + case EFI_HOB_TYPE_MEMORY_POOL: + Hobtypestring = "EFI_HOB_TYPE_MEMORY_POOL"; break; + case EFI_HOB_TYPE_UNUSED: + Hobtypestring = "EFI_HOB_TYPE_UNUSED"; break; + case EFI_HOB_TYPE_END_OF_HOB_LIST: + Hobtypestring = "EFI_HOB_TYPE_END_OF_HOB_LIST"; break; + default: + Hobtypestring = "EFI_HOB_TYPE_UNRECOGNIZED"; break; + } + + return Hobtypestring; +} + +/* Print out a structure of all the HOBs + * that match a certain type: + * Print all types (0x0000) + * EFI_HOB_TYPE_HANDOFF (0x0001) + * EFI_HOB_TYPE_MEMORY_ALLOCATION (0x0002) + * EFI_HOB_TYPE_RESOURCE_DESCRIPTOR (0x0003) + * EFI_HOB_TYPE_GUID_EXTENSION (0x0004) + * EFI_HOB_TYPE_MEMORY_POOL (0x0007) + * EFI_HOB_TYPE_UNUSED (0xFFFE) + * EFI_HOB_TYPE_END_OF_HOB_LIST (0xFFFF) + */ +void print_hob_type_structure(u16 Hobtype, void *Hoblistptr) +{ + u32 *Currenthob; + u32 *Nexthob = 0; + u8 Lasthob = 0; + u32 Currenttype; + const char *Currenttypestr; + + Currenthob = Hoblistptr; + + /* Print out HOBs of our desired type until + * the end of the HOB list + */ + printk(BIOS_DEBUG, "\n=== FSP HOB Data Structure ===\n"); + printk(BIOS_DEBUG, "FSP Hoblistptr: 0x%0x\n", + (u32) Hoblistptr); + do { + EFI_HOB_GENERIC_HEADER *CurrentHeaderPtr = + (EFI_HOB_GENERIC_HEADER *)Currenthob; + Currenttype = CurrentHeaderPtr->HobType; /* Get the type of this HOB */ + Currenttypestr = get_hob_type_string(Currenthob); + + if (Currenttype == Hobtype || Hobtype == 0x0000) { + printk(BIOS_DEBUG, "HOB 0x%0x is an %s (type 0x%0x)\n", + (u32) Currenthob, Currenttypestr, Currenttype); + switch (Currenttype) { + case EFI_HOB_TYPE_MEMORY_ALLOCATION: + print_hob_mem_attributes(Currenthob); break; + case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR: + print_hob_resource_attributes(Currenthob); break; + } + } + + Lasthob = END_OF_HOB_LIST(Currenthob); /* Check for end of HOB list */ + if (!Lasthob) { + Nexthob = GET_NEXT_HOB(Currenthob); /* Get next HOB pointer */ + Currenthob = Nexthob; // Start on next HOB + } + } while (!Lasthob); + printk(BIOS_DEBUG, "=== End of FSP HOB Data Structure ===\n\n"); +}

1 0

Patch set updated for coreboot: 38975ab drivers/intel/fsp: Add HOB tools to work with GUIDs
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8066 -gerrit commit 38975ab7b021494a4de7acf73bd87ad8f0bf8433 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sat Jan 3 17:18:58 2015 -0700 drivers/intel/fsp: Add HOB tools to work with GUIDs Add new functions to: - Compare two GUIDs - Find a hob based on its GUID - Print information about GUID_EXTENSION type HOBs - Print a GUID's address and value Change-Id: I89377ec8ab7d98fe7dc129097e643aac061ab3a3 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/drivers/intel/fsp/fsp_util.h | 4 ++ src/drivers/intel/fsp/hob.c | 98 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) diff --git a/src/drivers/intel/fsp/fsp_util.h b/src/drivers/intel/fsp/fsp_util.h index cb667dc..3c72f24 100644 --- a/src/drivers/intel/fsp/fsp_util.h +++ b/src/drivers/intel/fsp/fsp_util.h @@ -42,7 +42,11 @@ void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr); void print_hob_mem_attributes(void *Hobptr); void print_hob_type_structure(u16 Hobtype, void *Hoblistptr); void print_hob_resource_attributes(void *Hobptr); +void print_guid_type_attributes(void *Hobptr); const char * get_hob_type_string(void *Hobptr); +void * find_hob_by_guid(void *Hoblistptr, EFI_GUID *guid1); +uint8_t guids_are_equal(EFI_GUID *guid1, EFI_GUID *guid2); +void printguid(EFI_GUID *guid); /* Additional HOB types not included in the FSP: * #define EFI_HOB_TYPE_HANDOFF 0x0001 diff --git a/src/drivers/intel/fsp/hob.c b/src/drivers/intel/fsp/hob.c index 4537ffb..58cb252 100644 --- a/src/drivers/intel/fsp/hob.c +++ b/src/drivers/intel/fsp/hob.c @@ -20,8 +20,27 @@ #include <types.h> #include <string.h> #include <console/console.h> +#include <lib.h> // hexdump #include "fsp_util.h" + +/** Displays a GUID's address and value + * + * @param guid pointer to the GUID to display + */ +void printguid(EFI_GUID *guid) +{ + printk(BIOS_SPEW,"Address: %p Guid: %08lx-%04x-%04x-%02x%02x-", + guid, (unsigned long)guid->Data1, + guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1]); + printk(BIOS_SPEW,"%02x%02x%02x%02x%02x%02x%02x%02x\n", + guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7], + guid->Data4[8], guid->Data4[9] ); +} + void print_hob_mem_attributes(void *Hobptr) { EFI_HOB_MEMORY_ALLOCATION *HobMemoryPtr = (EFI_HOB_MEMORY_ALLOCATION *)Hobptr; @@ -118,6 +137,27 @@ const char * get_hob_type_string(void *Hobptr) return Hobtypestring; } +/** Displays the length, location, and GUID value of a GUID extension + * + * The EFI_HOB_GUID_TYPE is very basic - it just contains the standard + * HOB header containing the HOB type and length, and a GUID for + * identification. The rest of the data is undefined and must be known + * based on the GUID. + * + * This displays the entire HOB length, and the location of the start + * of the HOB, *NOT* the length of or the start of the data inside the HOB. + * + * @param Hobptr + */ +void print_guid_type_attributes(void *Hobptr) +{ + printk(BIOS_SPEW, " at location %p with length0x%0lx\n ", + Hobptr, (unsigned long)(((EFI_PEI_HOB_POINTERS *) \ + Hobptr)->Guid->Header.HobLength)); + printguid(&(((EFI_HOB_GUID_TYPE *)Hobptr)->Name)); + +} + /* Print out a structure of all the HOBs * that match a certain type: * Print all types (0x0000) @@ -159,6 +199,8 @@ void print_hob_type_structure(u16 Hobtype, void *Hoblistptr) print_hob_mem_attributes(Currenthob); break; case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR: print_hob_resource_attributes(Currenthob); break; + case EFI_HOB_TYPE_GUID_EXTENSION: + print_guid_type_attributes(Currenthob); break; } } @@ -170,3 +212,59 @@ void print_hob_type_structure(u16 Hobtype, void *Hoblistptr) } while (!Lasthob); printk(BIOS_DEBUG, "=== End of FSP HOB Data Structure ===\n\n"); } + + +/** Finds a HOB entry based on type and guid + * + * @param current_hob pointer to the start of the HOB list + * @param guid the GUID of the HOB entry to find + * @return pointer to the start of the requested HOB or NULL if not found. + */ +void * find_hob_by_guid(void *current_hob, EFI_GUID *guid) +{ + do { + switch (((EFI_HOB_GENERIC_HEADER *)current_hob)->HobType) { + + case EFI_HOB_TYPE_MEMORY_ALLOCATION: + if (guids_are_equal(guid, &(((EFI_HOB_MEMORY_ALLOCATION *) \ + current_hob)->AllocDescriptor.Name))) + return current_hob; + break; + case EFI_HOB_TYPE_RESOURCE_DESCRIPTOR: + if (guids_are_equal(guid, + &(((EFI_HOB_RESOURCE_DESCRIPTOR *) \ + current_hob)->Owner))) + return current_hob; + break; + case EFI_HOB_TYPE_GUID_EXTENSION: + if (guids_are_equal(guid, &(((EFI_HOB_GUID_TYPE *) \ + current_hob)->Name))) + return current_hob; + break; + } + + if (!END_OF_HOB_LIST(current_hob)) + current_hob = GET_NEXT_HOB(current_hob); /* Get next HOB pointer */ + } while (!END_OF_HOB_LIST(current_hob)); + + return NULL; +} + +/** Compares a pair of GUIDs to see if they are equal + * + * GUIDs are 128 bits long, so compare them as pairs of quadwords. + * + * @param guid1 pointer to the first of the GUIDs to compare + * @param guid2 pointer to the second of the GUIDs to compare + * @return 1 if the GUIDs were equal, 0 if GUIDs were not equal + */ +uint8_t guids_are_equal(EFI_GUID *guid1, EFI_GUID *guid2) +{ + uint64_t* guid_1 = (void *) guid1; + uint64_t* guid_2 = (void *) guid2; + + if ((*(guid_1) != *(guid_2)) || (*(guid_1 + 1) != *(guid_2 + 1))) + return 0; + + return 1; +}

1 0

Patch set updated for coreboot: 67f9386 fsp_baytrail: Do the CAR CBMRM transition
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8096 -gerrit commit 67f9386741651b504c76ba3666433cc863368355 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 17:44:35 2015 -0700 fsp_baytrail: Do the CAR CBMRM transition - Add FSP driver routine to find and return a pointer to the saved CAR data. - Add the TEMPORARY_MEMORY_HOB_GUID, used to find the saved CAR data. - Move the cbmem_recovery call from romstage.c into chipset_fsp_util.c so that it's completed by the time we get back to romstage. - Clear area in the stack in early romstage for CBMEM - Remove printk from chipset_prev_sleep_state - this gets called multiple times, including at a point when CBMEM could have been initialized as a console device, but before it's been reinitialized after the CAR->memory transition. Change-Id: Ie3b6797cbcc9bbc6b7c9185a5fc9a85096c40ff6 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/drivers/intel/fsp/fsp_util.c | 25 +++++++++++++++++++++++ src/drivers/intel/fsp/fsp_util.h | 7 +++++++ src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c | 20 +++++++++++++++--- src/soc/intel/fsp_baytrail/romstage/romstage.c | 7 ++----- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/drivers/intel/fsp/fsp_util.c b/src/drivers/intel/fsp/fsp_util.c index d0ed9cf..8f9b7aa 100644 --- a/src/drivers/intel/fsp/fsp_util.c +++ b/src/drivers/intel/fsp/fsp_util.c @@ -177,6 +177,31 @@ volatile u8 * find_fsp () return (fsp_ptr); } +/** finds the saved temporary memory information in the FSP HOB list + * + * @param[in] hob_list_ptr pointer to the start of the hob list + * @param[out] location ptr to ptr gets filled in with stack location + * @param[in] length ptr gets filled in with stack length + * @return 1 if stack was found, 0 if stack was not found + */ +uint8_t find_saved_temp_mem(void *hob_list_ptr, void **location, + uint32_t *length) +{ + EFI_GUID temp_hob_guid = FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID; + + EFI_HOB_GUID_TYPE *saved_mem_hob; + saved_mem_hob = (EFI_HOB_GUID_TYPE *) find_hob_by_guid(hob_list_ptr, + &temp_hob_guid); + + if (saved_mem_hob == NULL) + return 0; + + *length = saved_mem_hob->Header.HobLength; + *location =(void *) ((char *) saved_mem_hob + + sizeof(EFI_HOB_GUID_TYPE)); + return 1; +} + #ifndef __PRE_RAM__ /* Only parse HOB data in ramstage */ void print_fsp_info(void) { diff --git a/src/drivers/intel/fsp/fsp_util.h b/src/drivers/intel/fsp/fsp_util.h index 3c72f24..ff6daca 100644 --- a/src/drivers/intel/fsp/fsp_util.h +++ b/src/drivers/intel/fsp/fsp_util.h @@ -37,6 +37,7 @@ void print_fsp_info(void); void chipset_fsp_early_init(FSP_INIT_PARAMS *FspInitParams, FSP_INFO_HEADER *fsp_ptr); void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr); +uint8_t find_saved_temp_mem(void *hob_list_ptr, void **location, uint32_t *length); /* functions in hob.c */ void print_hob_mem_attributes(void *Hobptr); @@ -124,4 +125,10 @@ extern void *FspHobListPtr; UpdData->member?"Enabled":"Disabled"); \ break; + +#ifndef FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID +#define FSP_BOOTLOADER_TEMPORARY_MEMORY_HOB_GUID \ + { 0xbbcff46c, 0xc8d3, 0x4113, { 0x89, 0x85, 0xb9, 0xd4, 0xf3, 0xb3, 0xf6, 0x4e } }; +#endif + #endif /* FSP_UTIL_H */ diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c index c6b5f9c..b645682 100644 --- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c +++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c @@ -34,6 +34,7 @@ #include <baytrail/acpi.h> #include <baytrail/iomap.h> #include <baytrail/smm.h> +#include <arch/early_variables.h> #ifdef __PRE_RAM__ #include <baytrail/romstage.h> @@ -326,12 +327,25 @@ void chipset_fsp_early_init(FSP_INIT_PARAMS *pFspInitParams, } /* The FSP returns here after the fsp_early_init call */ -void ChipsetFspReturnPoint(EFI_STATUS Status, - VOID *HobListPtr) +void ChipsetFspReturnPoint(EFI_STATUS Status, VOID *HobListPtr) { - if (Status == 0xFFFFFFFF) { + void *saved_tmp_mem_location; + uint32_t saved_tmp_mem_length; + + if (Status == 0xFFFFFFFF) warm_reset(); + + /* find the saved temp memory so we can recover cbmem */ + find_saved_temp_mem(HobListPtr, &saved_tmp_mem_location, + &saved_tmp_mem_length); + cbmem_recovery(chipset_prev_sleep_state(0) == 3); + + if (saved_tmp_mem_location != NULL) { + do_car_migrate_variables(saved_tmp_mem_location); + } else { + printk(BIOS_DEBUG, "Skipping CBMEM variable migration.\n"); } + romstage_main_continue(Status, HobListPtr); } diff --git a/src/soc/intel/fsp_baytrail/romstage/romstage.c b/src/soc/intel/fsp_baytrail/romstage/romstage.c index 2619c96..1529850 100644 --- a/src/soc/intel/fsp_baytrail/romstage/romstage.c +++ b/src/soc/intel/fsp_baytrail/romstage/romstage.c @@ -59,9 +59,6 @@ uint32_t chipset_prev_sleep_state(uint32_t clear) pm1_cnt = inl(ACPI_BASE_ADDRESS + PM1_CNT); gen_pmcon1 = read32(PMC_BASE_ADDRESS + GEN_PMCON1); - printk(BIOS_DEBUG, "PM1_STS = 0x%x PM1_CNT = 0x%x GEN_PMCON1 = 0x%x\n", - pm1_sts, pm1_cnt, gen_pmcon1); - if (pm1_sts & WAK_STS) { switch ((pm1_cnt & SLP_TYP) >> SLP_TYP_SHIFT) { #if CONFIG_HAVE_ACPI_RESUME @@ -159,6 +156,8 @@ void main(FSP_INFO_HEADER *fsp_info_header) uint32_t fd_mask = 0; uint32_t fd2_mask = 0; + /* Clear stack area for CBMEM */ + memset((void *)CONFIG_DCACHE_RAM_BASE,0,0x3000); post_code(0x40); program_base_addresses(); @@ -215,7 +214,6 @@ void main(FSP_INFO_HEADER *fsp_info_header) * Memory is setup and the stack is set by the FSP. */ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) { - int cbmem_was_initted; void *cbmem_hob_ptr; uint32_t prev_sleep_state; struct romstage_handoff *handoff; @@ -258,7 +256,6 @@ void romstage_main_continue(EFI_STATUS status, void *hob_list_ptr) { post_code(0x4d); } - cbmem_was_initted = !cbmem_recovery(prev_sleep_state == 3); /* Save the HOB pointer in CBMEM to be used in ramstage*/ cbmem_hob_ptr = cbmem_add (CBMEM_ID_HOB_POINTER, sizeof(*hob_list_ptr));

1 0

New patch to review for coreboot: 121152a doxygen fixes: fix parameter names to match the functions
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8101 -gerrit commit 121152a5bb81444d7eaefcf3f9387cf77fbdc6ae Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 16:54:35 2015 -0700 doxygen fixes: fix parameter names to match the functions The doxygen parameter names in the comments no longer matched the functions they were attached to. Doxygen complains about extra parameter comments and uncommented parameters in the functions. Change-Id: I21b8a951f8d8d04b07c3779000eeaf1e69fed463 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/cpu/allwinner/a10/gpio.c | 2 +- src/device/device.c | 2 +- src/device/pci_device.c | 2 +- src/mainboard/intel/mohonpeak/romstage.c | 2 +- src/soc/samsung/exynos5250/clock.c | 4 ++-- src/soc/samsung/exynos5420/clock.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cpu/allwinner/a10/gpio.c b/src/cpu/allwinner/a10/gpio.c index 295cdf2..5fca2d7 100644 --- a/src/cpu/allwinner/a10/gpio.c +++ b/src/cpu/allwinner/a10/gpio.c @@ -68,7 +68,7 @@ int gpio_get(u8 port, u8 pin) * configured as output pins. * * @param[in] port GPIO port of the pin (GPA -> GPS) - * @param[in] value 32-bit mask indicating which pins to set. For a set bit, the + * @param[in] val 32-bit mask indicating which pins to set. For a set bit, the * corresponding pin will be set. Otherwise, it will be cleared */ void gpio_write(u8 port, u32 val) diff --git a/src/device/device.c b/src/device/device.c index e068cee..00e323a 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -179,7 +179,7 @@ device_t alloc_find_dev(struct bus *parent, struct device_path *path) * Round a number up to an alignment. * * @param val The starting value. - * @param roundup Alignment as a power of two. + * @param pow Alignment as a power of two. * @return Rounded up number. */ static resource_t round(resource_t val, unsigned long pow) diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 8351e9c..22454d6 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -1321,7 +1321,7 @@ const char *pin_to_str(int pin) * device. In this case, this function will return 4 (PIN D). * * @param dev A PCI device structure to swizzle interrupt pins for - * @param *parent_bdg The PCI device structure for the bridge + * @param *parent_bridge The PCI device structure for the bridge * device 'dev' is attached to * @return The interrupt pin number (1 - 4) that 'dev' will * trigger when generating an interrupt diff --git a/src/mainboard/intel/mohonpeak/romstage.c b/src/mainboard/intel/mohonpeak/romstage.c index b1fb995..ba5091a 100644 --- a/src/mainboard/intel/mohonpeak/romstage.c +++ b/src/mainboard/intel/mohonpeak/romstage.c @@ -72,7 +72,7 @@ void late_mainboard_romstage_entry(void) /** * Get function disables - most of these will be done automatically - * @param fd_mask + * @param mask pointer to the function-disable bitfield */ void get_func_disables(uint32_t *mask) { diff --git a/src/soc/samsung/exynos5250/clock.c b/src/soc/samsung/exynos5250/clock.c index 1de2ab2..a00af02 100644 --- a/src/soc/samsung/exynos5250/clock.c +++ b/src/soc/samsung/exynos5250/clock.c @@ -475,8 +475,8 @@ void clock_ll_set_ratio(enum periph_id periph_id, unsigned divisor) * * @param main_scalar_bits Number of main scalar bits, must be > 0 and < 32 * @param fine_scalar_bits Number of fine scalar bits, must be > 0 and < 32 - * @param input_freq Clock frequency to be scaled in Hz - * @param target_freq Desired clock frequency in Hz + * @param input_rate Clock frequency to be scaled in Hz + * @param target_rate Desired clock frequency in Hz * @param best_fine_scalar Pointer to store the fine stage divisor * * @return best_main_scalar Main scalar for desired frequency or -1 if none diff --git a/src/soc/samsung/exynos5420/clock.c b/src/soc/samsung/exynos5420/clock.c index 5bbeb04..5cf3583 100644 --- a/src/soc/samsung/exynos5420/clock.c +++ b/src/soc/samsung/exynos5420/clock.c @@ -439,8 +439,8 @@ void clock_ll_set_ratio(enum periph_id periph_id, unsigned divisor) * * @param main_scalar_bits Number of main scalar bits, must be > 0 and < 32 * @param fine_scalar_bits Number of fine scalar bits, must be > 0 and < 32 - * @param input_freq Clock frequency to be scaled in Hz - * @param target_freq Desired clock frequency in Hz + * @param input_rate Clock frequency to be scaled in Hz + * @param target_rate Desired clock frequency in Hz * @param best_fine_scalar Pointer to store the fine stage divisor * * @return best_main_scalar Main scalar for desired frequency or -1 if none

1 0

New patch to review for coreboot: 41f6beb doxygen fixes: change @var to @param var
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8100 -gerrit commit 41f6beb1d981b386da9e1699bc1f88e3ef0f3e18 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 16:47:39 2015 -0700 doxygen fixes: change @var to @param var These files were trying to document the parameters, but didn't have the syntax quite right. Change the comments from @varname to @param varname as required by doxygen. Change-Id: I63662094d3f1686e3e35b61925b580eb06e72e28 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/drivers/intel/gma/intel_dp.c | 6 +++--- src/drivers/ti/tps65090/tps65090.c | 5 +++-- src/drivers/ti/tps65090/tps65090.h | 20 ++++++++++---------- src/include/spi_flash.h | 6 +++--- src/lib/ramtest.c | 8 ++++---- src/soc/intel/common/hda_verb.c | 8 ++++---- src/soc/qualcomm/ipq806x/timer.c | 2 +- src/soc/samsung/exynos5250/fb.c | 2 +- src/southbridge/intel/lynxpoint/hda_verb.c | 8 ++++---- 9 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/drivers/intel/gma/intel_dp.c b/src/drivers/intel/gma/intel_dp.c index dc2a957..55839e1 100644 --- a/src/drivers/intel/gma/intel_dp.c +++ b/src/drivers/intel/gma/intel_dp.c @@ -38,7 +38,7 @@ /** * is_edp - is the given port attached to an eDP panel (either CPU or PCH) - * @intel_dp: DP struct + * @param intel_dp: DP struct * * If a CPU or PCH DP output is attached to an eDP panel, this function * will return 1, and 0 otherwise. @@ -50,7 +50,7 @@ static int is_edp(struct intel_dp *intel_dp) /** * is_pch_edp - is the port on the PCH and attached to an eDP panel? - * @intel_dp: DP struct + * @param intel_dp: DP struct * * Returns 1 if the given DP struct corresponds to a PCH DP port attached * to an eDP panel, 0 otherwise. Helpful for determining whether we @@ -63,7 +63,7 @@ static int is_pch_edp(struct intel_dp *intel_dp) /** * is_cpu_edp - is the port on the CPU and attached to an eDP panel? - * @intel_dp: DP struct + * @param intel_dp: DP struct * * Returns 1 if the given DP struct corresponds to a CPU eDP port. */ diff --git a/src/drivers/ti/tps65090/tps65090.c b/src/drivers/ti/tps65090/tps65090.c index 35a050f..58bb3ce 100644 --- a/src/drivers/ti/tps65090/tps65090.c +++ b/src/drivers/ti/tps65090/tps65090.c @@ -87,8 +87,9 @@ static int tps65090_i2c_read(unsigned int bus, /** * Set the power state for a FET * - * @fet_id Fet number to set (1..MAX_FET_NUM) - * @set 1 to power on FET, 0 to power off + * @param bus + * @param fet_id Fet number to set (1..MAX_FET_NUM) + * @param set 1 to power on FET, 0 to power off * @return FET_ERR_COMMS if we got a comms error, FET_ERR_NOT_READY if the * FET failed to change state. If all is ok, returns 0. */ diff --git a/src/drivers/ti/tps65090/tps65090.h b/src/drivers/ti/tps65090/tps65090.h index b38db59..a79158b 100644 --- a/src/drivers/ti/tps65090/tps65090.h +++ b/src/drivers/ti/tps65090/tps65090.h @@ -67,8 +67,8 @@ enum { /** * Enable FET * - * @bus I2C bus number the TPS65090 is on - * @fet_id FET ID, value between 1 and 7 + * @param bus I2C bus number the TPS65090 is on + * @param fet_id FET ID, value between 1 and 7 * return 0 on success, non-0 on failure */ int tps65090_fet_enable(unsigned int bus, enum fet_id fet_id); @@ -76,8 +76,8 @@ int tps65090_fet_enable(unsigned int bus, enum fet_id fet_id); /** * Disable FET * - * @bus I2C bus number the TPS65090 is on - * @fet_id FET ID, value between 1 and 7 + * @param bus I2C bus number the TPS65090 is on + * @param fet_id FET ID, value between 1 and 7 * @return 0 on success, non-0 on failure */ int tps65090_fet_disable(unsigned int bus, enum fet_id fet_id); @@ -85,8 +85,8 @@ int tps65090_fet_disable(unsigned int bus, enum fet_id fet_id); /** * Is FET enabled? * - * @bus I2C bus number the TPS65090 is on - * @fet_id FET ID, value between 1 and 7 + * @param bus I2C bus number the TPS65090 is on + * @param fet_id FET ID, value between 1 and 7 * @return 1 enabled, 0 disabled, negative value on failure */ int tps65090_fet_is_enabled(unsigned int bus, enum fet_id fet_id); @@ -94,15 +94,15 @@ int tps65090_fet_is_enabled(unsigned int bus, enum fet_id fet_id); /** * Enable / disable the battery charger * - * @bus I2C bus number the TPS65090 is on - * @enable 0 to disable charging, non-zero to enable + * @param bus I2C bus number the TPS65090 is on + * @param enable 0 to disable charging, non-zero to enable */ int tps65090_set_charge_enable(unsigned int bus, int enable); /** * Check whether we have enabled battery charging * - * @bus I2C bus number the TPS65090 is on + * @param bus I2C bus number the TPS65090 is on * @return 1 if enabled, 0 if disabled */ int tps65090_is_charging(unsigned int bus); @@ -110,7 +110,7 @@ int tps65090_is_charging(unsigned int bus); /** * Return the value of the status register * - * @bus I2C bus number the TPS65090 is on + * @param bus I2C bus number the TPS65090 is on * @return status register value, or -1 on error */ int tps65090_get_status(unsigned int bus); diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h index 70ca784..7e430d0 100644 --- a/src/include/spi_flash.h +++ b/src/include/spi_flash.h @@ -30,9 +30,9 @@ /** * container_of - cast a member of a structure out to the containing structure - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. + * @param ptr: the pointer to the member. + * @param type: the type of the container struct this is embedded in. + * @param member: the name of the member within the struct. * */ #define container_of(ptr, type, member) ({ \ diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c index e9173fa..03c4aa7 100644 --- a/src/lib/ramtest.c +++ b/src/lib/ramtest.c @@ -52,9 +52,9 @@ static void phys_memory_barrier(void) * memory bus. To test most address lines, addresses are scattered * using 256B, 4kB and 64kB increments. * - * @idx Index to test pattern (0=<idx<0x400) - * @addr Memory to access on @idx - * @value Value to write or read at @addr + * @param idx Index to test pattern (0=<idx<0x400) + * @param addr Memory to access on idx + * @param value Value to write or read at addr */ static inline void test_pattern(unsigned short int idx, unsigned long *addr, unsigned long *value) @@ -74,7 +74,7 @@ static inline void test_pattern(unsigned short int idx, * Simple write-read-verify memory test. See console debug output for * any dislocated bytes. * - * @start System memory offset, aligned to 128bytes + * @param start System memory offset, aligned to 128bytes */ static int ram_bitset_nodie(unsigned long start) { diff --git a/src/soc/intel/common/hda_verb.c b/src/soc/intel/common/hda_verb.c index 6404ee2..946972e 100644 --- a/src/soc/intel/common/hda_verb.c +++ b/src/soc/intel/common/hda_verb.c @@ -139,10 +139,10 @@ static int hda_wait_for_valid(u32 base) /** * Find a specific entry within a verb table * - * @verb_table_bytes: verb table size in bytes - * @verb_table_data: verb table data - * @viddid: vendor/device to search for - * @verb_out: pointer to entry within table + * @param verb_table_bytes: verb table size in bytes + * @param verb_table_data: verb table data + * @param viddid: vendor/device to search for + * @param verb: pointer to entry within table * * Returns size of the entry within the verb table, * Returns 0 if the entry is not found diff --git a/src/soc/qualcomm/ipq806x/timer.c b/src/soc/qualcomm/ipq806x/timer.c index 676c7f5..3cb9531 100644 --- a/src/soc/qualcomm/ipq806x/timer.c +++ b/src/soc/qualcomm/ipq806x/timer.c @@ -50,7 +50,7 @@ void init_timer(void) /** * udelay - generates micro second delay. - * @usec: delay duration in microseconds + * @param usec: delay duration in microseconds * * With 32KHz clock, minimum possible delay is 31.25 Micro seconds and * its multiples. In Rumi GPT clock is 32 KHz diff --git a/src/soc/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c index 080be49..e0355fc 100644 --- a/src/soc/samsung/exynos5250/fb.c +++ b/src/soc/samsung/exynos5250/fb.c @@ -114,7 +114,7 @@ static void fimd_bypass(void) * Initialize display controller. * * @param lcdbase pointer to the base address of framebuffer. - * @pd pointer to the main panel_data structure + * @param pd pointer to the main panel_data structure */ void fb_init(unsigned long int fb_size, void *lcdbase, struct exynos5_fimd_panel *pd) diff --git a/src/southbridge/intel/lynxpoint/hda_verb.c b/src/southbridge/intel/lynxpoint/hda_verb.c index 234a1ab..424deb5 100644 --- a/src/southbridge/intel/lynxpoint/hda_verb.c +++ b/src/southbridge/intel/lynxpoint/hda_verb.c @@ -140,10 +140,10 @@ static int hda_wait_for_valid(u32 base) /** * Find a specific entry within a verb table * - * @verb_table_bytes: verb table size in bytes - * @verb_table_data: verb table data - * @viddid: vendor/device to search for - * @verb_out: pointer to entry within table + * @param verb_table_bytes: verb table size in bytes + * @param verb_table_data: verb table data + * @param viddid: vendor/device to search for + * @param **verb: pointer to entry within table * * Returns size of the entry within the verb table, * Returns 0 if the entry is not found

1 0

New patch to review for coreboot: e1d2494 AMD Mainboards - rd890_cfg.h: fix Doxygen errors.
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8099 -gerrit commit e1d2494ba69117a7387930eb23851c36c3f1564d Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 15:29:08 2015 -0700 AMD Mainboards - rd890_cfg.h: fix Doxygen errors. Doxygen gives an error when processing #defines inside doxygen comments. Normal comments are ignored. The choice for this fix was to make this a standard comment starting with '/*' instead of '/**', or to make the comment not a #define. Change-Id: I97fbbcea6f045d80ec7c0ab5e196d57e5da16d86 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/mainboard/amd/dinar/rd890_cfg.h | 2 +- src/mainboard/supermicro/h8qgi/rd890_cfg.h | 2 +- src/mainboard/supermicro/h8scm/rd890_cfg.h | 2 +- src/mainboard/tyan/s8226/rd890_cfg.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mainboard/amd/dinar/rd890_cfg.h b/src/mainboard/amd/dinar/rd890_cfg.h index 71cac2e..1743474 100644 --- a/src/mainboard/amd/dinar/rd890_cfg.h +++ b/src/mainboard/amd/dinar/rd890_cfg.h @@ -67,7 +67,7 @@ /** * Bitmap of ports that have slot or onboard device connected. * Example force PCIe Gen1 supporton port 2 and 4 (DEFAULT_PORT_ENABLE_MAP = BIT2 | BIT4) - * #define DEFAULT_PORT_FORCE_GEN1 0x604 + * define DEFAULT_PORT_FORCE_GEN1 0x604 */ #ifndef DEFAULT_PORT_FORCE_GEN1 #define DEFAULT_PORT_FORCE_GEN1 0x0 diff --git a/src/mainboard/supermicro/h8qgi/rd890_cfg.h b/src/mainboard/supermicro/h8qgi/rd890_cfg.h index 8547faa..d74cb93 100644 --- a/src/mainboard/supermicro/h8qgi/rd890_cfg.h +++ b/src/mainboard/supermicro/h8qgi/rd890_cfg.h @@ -66,7 +66,7 @@ /** * Bitmap of ports that have slot or onboard device connected. * Example force PCIe Gen1 supporton port 2 and 4 (DEFAULT_PORT_ENABLE_MAP = BIT2 | BIT4) - * #define DEFAULT_PORT_FORCE_GEN1 0x604 + * define DEFAULT_PORT_FORCE_GEN1 0x604 */ #ifndef DEFAULT_PORT_FORCE_GEN1 #define DEFAULT_PORT_FORCE_GEN1 0x0 diff --git a/src/mainboard/supermicro/h8scm/rd890_cfg.h b/src/mainboard/supermicro/h8scm/rd890_cfg.h index 8547faa..d74cb93 100644 --- a/src/mainboard/supermicro/h8scm/rd890_cfg.h +++ b/src/mainboard/supermicro/h8scm/rd890_cfg.h @@ -66,7 +66,7 @@ /** * Bitmap of ports that have slot or onboard device connected. * Example force PCIe Gen1 supporton port 2 and 4 (DEFAULT_PORT_ENABLE_MAP = BIT2 | BIT4) - * #define DEFAULT_PORT_FORCE_GEN1 0x604 + * define DEFAULT_PORT_FORCE_GEN1 0x604 */ #ifndef DEFAULT_PORT_FORCE_GEN1 #define DEFAULT_PORT_FORCE_GEN1 0x0 diff --git a/src/mainboard/tyan/s8226/rd890_cfg.h b/src/mainboard/tyan/s8226/rd890_cfg.h index 8547faa..d74cb93 100644 --- a/src/mainboard/tyan/s8226/rd890_cfg.h +++ b/src/mainboard/tyan/s8226/rd890_cfg.h @@ -66,7 +66,7 @@ /** * Bitmap of ports that have slot or onboard device connected. * Example force PCIe Gen1 supporton port 2 and 4 (DEFAULT_PORT_ENABLE_MAP = BIT2 | BIT4) - * #define DEFAULT_PORT_FORCE_GEN1 0x604 + * define DEFAULT_PORT_FORCE_GEN1 0x604 */ #ifndef DEFAULT_PORT_FORCE_GEN1 #define DEFAULT_PORT_FORCE_GEN1 0x0

1 0

New patch to review for coreboot: 1b51755 AMD platforms: fix callout_entry doxygen errors
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8098 -gerrit commit 1b51755a52b778e50e35f375aa5172a38769360b Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 15:22:26 2015 -0700 AMD platforms: fix callout_entry doxygen errors Somewhere along the line, the sb_cfg parameter name was changed to config, but this wasn't carried into the documentation or the function prototypes everywhere. Change-Id: Iccb0829c2f50370dddb70af915a6759316c4727a Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/mainboard/amd/dinar/sb700_cfg.h | 4 ++-- src/mainboard/supermicro/h8qgi/sb700_cfg.h | 4 ++-- src/mainboard/supermicro/h8scm/sb700_cfg.h | 4 ++-- src/mainboard/tyan/s8226/sb700_cfg.h | 4 ++-- src/southbridge/amd/cimx/sb700/late.c | 2 +- src/southbridge/amd/cimx/sb800/cfg.h | 4 ++-- src/southbridge/amd/cimx/sb800/late.c | 2 +- src/southbridge/amd/cimx/sb900/late.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mainboard/amd/dinar/sb700_cfg.h b/src/mainboard/amd/dinar/sb700_cfg.h index 216c264..539a576 100644 --- a/src/mainboard/amd/dinar/sb700_cfg.h +++ b/src/mainboard/amd/dinar/sb700_cfg.h @@ -233,9 +233,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg); * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_cfg Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ -u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg); +u32 sb700_callout_entry(u32 func, u32 data, void* config); #endif //_SB700_CFG_H_ diff --git a/src/mainboard/supermicro/h8qgi/sb700_cfg.h b/src/mainboard/supermicro/h8qgi/sb700_cfg.h index 1df3fc5..1b1c636 100644 --- a/src/mainboard/supermicro/h8qgi/sb700_cfg.h +++ b/src/mainboard/supermicro/h8qgi/sb700_cfg.h @@ -233,9 +233,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg); * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_cfg Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ -u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg); +u32 sb700_callout_entry(u32 func, u32 data, void* config); #endif //_SB700_CFG_H_ diff --git a/src/mainboard/supermicro/h8scm/sb700_cfg.h b/src/mainboard/supermicro/h8scm/sb700_cfg.h index 40c89fa..2f3ece2 100644 --- a/src/mainboard/supermicro/h8scm/sb700_cfg.h +++ b/src/mainboard/supermicro/h8scm/sb700_cfg.h @@ -233,9 +233,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg); * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_cfg Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ -u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg); +u32 sb700_callout_entry(u32 func, u32 data, void* config); #endif //_SB700_CFG_H_ diff --git a/src/mainboard/tyan/s8226/sb700_cfg.h b/src/mainboard/tyan/s8226/sb700_cfg.h index c1ee84c..9c566a5 100644 --- a/src/mainboard/tyan/s8226/sb700_cfg.h +++ b/src/mainboard/tyan/s8226/sb700_cfg.h @@ -228,9 +228,9 @@ void sb700_cimx_config(AMDSBCFG *sb_cfg); * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_cfg Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ -u32 sb700_callout_entry(u32 func, u32 data, void* sb_cfg); +u32 sb700_callout_entry(u32 func, u32 data, void* config); #endif //_SB700_CFG_H_ diff --git a/src/southbridge/amd/cimx/sb700/late.c b/src/southbridge/amd/cimx/sb700/late.c index 3fa6940..b0ec2dc 100644 --- a/src/southbridge/amd/cimx/sb700/late.c +++ b/src/southbridge/amd/cimx/sb700/late.c @@ -51,7 +51,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg; * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_config Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ u32 sb700_callout_entry(u32 func, u32 data, void* config) diff --git a/src/southbridge/amd/cimx/sb800/cfg.h b/src/southbridge/amd/cimx/sb800/cfg.h index 1fc3f7c..f6a3ab0 100644 --- a/src/southbridge/amd/cimx/sb800/cfg.h +++ b/src/southbridge/amd/cimx/sb800/cfg.h @@ -36,9 +36,9 @@ void sb800_cimx_config(AMDSBCFG *sb_cfg); * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_cfg Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ -u32 sb800_callout_entry(u32 func, u32 data, void* sb_cfg); +u32 sb800_callout_entry(u32 func, u32 data, void* config); #endif diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index d7f22d3..1eb865e 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -56,7 +56,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg; * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_config Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ u32 sb800_callout_entry(u32 func, u32 data, void* config) diff --git a/src/southbridge/amd/cimx/sb900/late.c b/src/southbridge/amd/cimx/sb900/late.c index e9f5ad6..6d47f05 100644 --- a/src/southbridge/amd/cimx/sb900/late.c +++ b/src/southbridge/amd/cimx/sb900/late.c @@ -54,7 +54,7 @@ static AMDSBCFG *sb_config = &sb_late_cfg; * * @param[in] func Southbridge CIMx Function ID. * @param[in] data Southbridge Input Data. - * @param[in] sb_config Southbridge configuration structure pointer. + * @param[in] config Southbridge configuration structure pointer. * */ u32 sb900_callout_entry(u32 func, u32 data, void* config)

1 0

New patch to review for coreboot: d9968b2 AMD Mainboards - rd890_cfg.c: Fix doxygen warnings
by Martin Roth 05 Jan '15

05 Jan '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8097 -gerrit commit d9968b2d78461c1f0395d4864f53c711bf3d80de Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Jan 4 15:12:21 2015 -0700 AMD Mainboards - rd890_cfg.c: Fix doxygen warnings Remove variable types from the param declaration. Change-Id: Ia6a3d36fcf01d7a52bb1a31cfdb47d88bf612d79 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/mainboard/amd/dinar/rd890_cfg.c | 6 +++--- src/mainboard/supermicro/h8qgi/rd890_cfg.c | 6 +++--- src/mainboard/supermicro/h8scm/rd890_cfg.c | 6 +++--- src/mainboard/tyan/s8226/rd890_cfg.c | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mainboard/amd/dinar/rd890_cfg.c b/src/mainboard/amd/dinar/rd890_cfg.c index 69c4d41..deceae3 100644 --- a/src/mainboard/amd/dinar/rd890_cfg.c +++ b/src/mainboard/amd/dinar/rd890_cfg.c @@ -104,9 +104,9 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr) * * prototype AGESA_STATUS (*CALLOUT_ENTRY) (UINT32 Param1, UINTN Param2, VOID* ConfigPtr); * - * @param[in] u32 func Northbridge CIMx CallBackId - * @param[in] u32 data Northbridge Input Data. - * @param[in] AMD_NB_CONFIG *config Northbridge configuration structure pointer. + * @param[in] func Northbridge CIMx CallBackId + * @param[in] data Northbridge Input Data. + * @param[in] *config Northbridge configuration structure pointer. * */ static u32 rd890_callout_entry(u32 func, u32 data, void *config) diff --git a/src/mainboard/supermicro/h8qgi/rd890_cfg.c b/src/mainboard/supermicro/h8qgi/rd890_cfg.c index a5f6650..7ea9e86 100644 --- a/src/mainboard/supermicro/h8qgi/rd890_cfg.c +++ b/src/mainboard/supermicro/h8qgi/rd890_cfg.c @@ -104,9 +104,9 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr) * * prototype AGESA_STATUS (*CALLOUT_ENTRY) (UINT32 Param1, UINTN Param2, VOID* ConfigPtr); * - * @param[in] u32 func Northbridge CIMx CallBackId - * @param[in] u32 data Northbridge Input Data. - * @param[in] AMD_NB_CONFIG *config Northbridge configuration structure pointer. + * @param[in] func Northbridge CIMx CallBackId + * @param[in] data Northbridge Input Data. + * @param[in] *config Northbridge configuration structure pointer. * */ static u32 rd890_callout_entry(u32 func, u32 data, void *config) diff --git a/src/mainboard/supermicro/h8scm/rd890_cfg.c b/src/mainboard/supermicro/h8scm/rd890_cfg.c index a5f6650..7ea9e86 100644 --- a/src/mainboard/supermicro/h8scm/rd890_cfg.c +++ b/src/mainboard/supermicro/h8scm/rd890_cfg.c @@ -104,9 +104,9 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr) * * prototype AGESA_STATUS (*CALLOUT_ENTRY) (UINT32 Param1, UINTN Param2, VOID* ConfigPtr); * - * @param[in] u32 func Northbridge CIMx CallBackId - * @param[in] u32 data Northbridge Input Data. - * @param[in] AMD_NB_CONFIG *config Northbridge configuration structure pointer. + * @param[in] func Northbridge CIMx CallBackId + * @param[in] data Northbridge Input Data. + * @param[in] *config Northbridge configuration structure pointer. * */ static u32 rd890_callout_entry(u32 func, u32 data, void *config) diff --git a/src/mainboard/tyan/s8226/rd890_cfg.c b/src/mainboard/tyan/s8226/rd890_cfg.c index a5f6650..7ea9e86 100644 --- a/src/mainboard/tyan/s8226/rd890_cfg.c +++ b/src/mainboard/tyan/s8226/rd890_cfg.c @@ -104,9 +104,9 @@ static void nb_platform_config(device_t nb_dev, AMD_NB_CONFIG *NbConfigPtr) * * prototype AGESA_STATUS (*CALLOUT_ENTRY) (UINT32 Param1, UINTN Param2, VOID* ConfigPtr); * - * @param[in] u32 func Northbridge CIMx CallBackId - * @param[in] u32 data Northbridge Input Data. - * @param[in] AMD_NB_CONFIG *config Northbridge configuration structure pointer. + * @param[in] func Northbridge CIMx CallBackId + * @param[in] data Northbridge Input Data. + * @param[in] *config Northbridge configuration structure pointer. * */ static u32 rd890_callout_entry(u32 func, u32 data, void *config)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2015