From 695d86243e7d2291b670d12b61446bd50708377e Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Fri, 29 May 2020 23:10:12 +0800 Subject: amd/microcode: Change equivalant ID width to 16bit The definition of processor_rev_id in struct microcode is 16 bits. So we need to change the a series of parameters passing to 16 bits. Change-Id: Iacabee7e571bd37f3aca106d515d755969daf8f3 Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/41869 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/cpu/amd/pi/00730F01/microcode_fam16h.c | 4 ++-- src/cpu/amd/pi/00730F01/update_microcode.c | 2 +- src/include/cpu/amd/microcode.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cpu/amd/pi/00730F01/microcode_fam16h.c b/src/cpu/amd/pi/00730F01/microcode_fam16h.c index 496f2ec9f1..7d47258d1c 100644 --- a/src/cpu/amd/pi/00730F01/microcode_fam16h.c +++ b/src/cpu/amd/pi/00730F01/microcode_fam16h.c @@ -88,7 +88,7 @@ static void apply_microcode_patch(const struct microcode *m) } static void amd_update_microcode(const void *ucode, size_t ucode_len, - uint32_t equivalent_processor_rev_id) + uint16_t equivalent_processor_rev_id) { const struct microcode *m; const uint8_t *c = ucode; @@ -99,7 +99,7 @@ static void amd_update_microcode(const void *ucode, size_t ucode_len, apply_microcode_patch(m); } -void amd_update_microcode_from_cbfs(uint32_t equivalent_processor_rev_id) +void amd_update_microcode_from_cbfs(uint16_t equivalent_processor_rev_id) { const void *ucode; size_t ucode_len; diff --git a/src/cpu/amd/pi/00730F01/update_microcode.c b/src/cpu/amd/pi/00730F01/update_microcode.c index 9142681a41..e3f0c3bdae 100644 --- a/src/cpu/amd/pi/00730F01/update_microcode.c +++ b/src/cpu/amd/pi/00730F01/update_microcode.c @@ -37,7 +37,7 @@ static u16 get_equivalent_processor_rev_id(u32 orig_id) void update_microcode(u32 cpu_deviceid) { - u32 equivalent_processor_rev_id = + u16 equivalent_processor_rev_id = get_equivalent_processor_rev_id(cpu_deviceid); amd_update_microcode_from_cbfs(equivalent_processor_rev_id); } diff --git a/src/include/cpu/amd/microcode.h b/src/include/cpu/amd/microcode.h index 8ebe675f3e..29b5576a7f 100644 --- a/src/include/cpu/amd/microcode.h +++ b/src/include/cpu/amd/microcode.h @@ -2,6 +2,6 @@ #define CPU_AMD_MICROCODE_H void update_microcode(u32 cpu_deviceid); -void amd_update_microcode_from_cbfs(u32 equivalent_processor_rev_id); +void amd_update_microcode_from_cbfs(u16 equivalent_processor_rev_id); #endif /* CPU_AMD_MICROCODE_H */ -- cgit v1.2.3