diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/intel/common/fsp_reset.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/common/reset.h | 4 | ||||
| -rw-r--r-- | src/soc/intel/meteorlake/chip.c | 6 | ||||
| -rw-r--r-- | src/soc/intel/pantherlake/chip.c | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/soc/intel/common/fsp_reset.c b/src/soc/intel/common/fsp_reset.c index 2626c39413..983d4fce53 100644 --- a/src/soc/intel/common/fsp_reset.c +++ b/src/soc/intel/common/fsp_reset.c @@ -41,7 +41,7 @@ void chipset_handle_reset(efi_return_status_t status) die("unknown reset type"); } -static uint32_t fsp_reset_type_to_status(EFI_RESET_TYPE reset_type) +static efi_return_status_t fsp_reset_type_to_status(EFI_RESET_TYPE reset_type) { efi_return_status_t status; @@ -68,7 +68,7 @@ static uint32_t fsp_reset_type_to_status(EFI_RESET_TYPE reset_type) * If reset type is `EfiResetPlatformSpecific` then relying on pch_reset_data structure * to know if the reset type is a global reset. */ -uint32_t fsp_get_pch_reset_status(void) +efi_return_status_t fsp_get_pch_reset_status(void) { size_t size; const struct fsp_reset_hob *hob = fsp_find_extension_hob_by_guid(fsp_reset_guid, &size); diff --git a/src/soc/intel/common/reset.h b/src/soc/intel/common/reset.h index d9c6ac6228..658223c32a 100644 --- a/src/soc/intel/common/reset.h +++ b/src/soc/intel/common/reset.h @@ -3,6 +3,8 @@ #ifndef _INTEL_COMMON_RESET_H_ #define _INTEL_COMMON_RESET_H_ +#include <efi/efi_datatype.h> + /* * Implement SoC specific global reset (i.e. a reset of both host and * ME partitions). Usually the ME is asked to perform the reset first. @@ -21,6 +23,6 @@ __noreturn void global_reset(void); * If reset type if `EfiResetPlatformSpecific` then relying on pch_reset_data structure * to know if the reset type is a global reset. */ -uint32_t fsp_get_pch_reset_status(void); +efi_return_status_t fsp_get_pch_reset_status(void); #endif /* _INTEL_COMMON_RESET_H_ */ diff --git a/src/soc/intel/meteorlake/chip.c b/src/soc/intel/meteorlake/chip.c index 84b9235b25..d2011f9899 100644 --- a/src/soc/intel/meteorlake/chip.c +++ b/src/soc/intel/meteorlake/chip.c @@ -264,7 +264,7 @@ static void soc_enable(struct device *dev) static void soc_init_final_device(void *chip_info) { - uint32_t reset_status = fsp_get_pch_reset_status(); + efi_return_status_t reset_status = fsp_get_pch_reset_status(); if (reset_status == FSP_SUCCESS) return; @@ -273,8 +273,8 @@ static void soc_init_final_device(void *chip_info) fsp_handle_reset(reset_status); /* Control shouldn't return here */ - die_with_post_code(POSTCODE_HW_INIT_FAILURE, - "Failed to handle the FSP reset request with error 0x%08x\n", reset_status); + fsp_die_with_post_code(reset_status, POSTCODE_HW_INIT_FAILURE, + "Failed to handle the FSP reset request with error"); } struct chip_operations soc_intel_meteorlake_ops = { diff --git a/src/soc/intel/pantherlake/chip.c b/src/soc/intel/pantherlake/chip.c index 4e7d5733f7..2d9f67a5df 100644 --- a/src/soc/intel/pantherlake/chip.c +++ b/src/soc/intel/pantherlake/chip.c @@ -262,7 +262,7 @@ static void soc_enable(struct device *dev) static void soc_init_final_device(void *chip_info) { - uint32_t reset_status = fsp_get_pch_reset_status(); + efi_return_status_t reset_status = fsp_get_pch_reset_status(); if (reset_status == FSP_SUCCESS) return; @@ -271,8 +271,8 @@ static void soc_init_final_device(void *chip_info) fsp_handle_reset(reset_status); /* Control shouldn't return here */ - die_with_post_code(POSTCODE_HW_INIT_FAILURE, - "Failed to handle the FSP reset request with error 0x%08x\n", reset_status); + fsp_die_with_post_code(reset_status, POSTCODE_HW_INIT_FAILURE, + "Failed to handle the FSP reset request with error"); } struct chip_operations soc_intel_pantherlake_ops = { |