diff options
| author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-01-30 23:47:45 -0600 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-01-31 21:33:10 +0100 |
| commit | 9c8106696ec7cddfda1c4881145ee385eeef92d8 (patch) | |
| tree | c318675e6e22805a5f6022ab4c55bb08ad8487b8 /src/cpu/amd/model_10xxx | |
| parent | 0d7f8d0b790446cd7f2f806c37ecdc2b9c8ed741 (diff) | |
| download | coreboot-9c8106696ec7cddfda1c4881145ee385eeef92d8.tar.xz | |
cpu/amd (non-AGESA): Fix AP crash during microcode version lookup
Move mapping tables to struct and prevent OOB array
access that was crashing the APs during CAR initialization.
Change-Id: I9e2554b50ad60a8d02ef4bd3fbee6fddb238d83f
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/8310
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@gmail.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Diffstat (limited to 'src/cpu/amd/model_10xxx')
| -rw-r--r-- | src/cpu/amd/model_10xxx/update_microcode.c | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c index 95624e94c6..3cdf97898a 100644 --- a/src/cpu/amd/model_10xxx/update_microcode.c +++ b/src/cpu/amd/model_10xxx/update_microcode.c @@ -1,6 +1,7 @@ /* * This file is part of the coreboot project. * + * Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering * Copyright (C) 2007 Advanced Micro Devices, Inc. * * This program is free software; you can redistribute it and/or modify @@ -56,22 +57,30 @@ static const u8 microcode_updates[] __attribute__ ((aligned(16))) = { 0x0, 0x0, 0x0, 0x0, }; -static u32 get_equivalent_processor_rev_id(u32 orig_id) { - static unsigned id_mapping_table[] = { - 0x100f00, 0x1000, - 0x100f01, 0x1000, - 0x100f02, 0x1000, - 0x100f20, 0x1020, - 0x100f21, 0x1020, - 0x100f2A, 0x1020, - 0x100f22, 0x1022, - 0x100f23, 0x1022, - 0x100f42, 0x1041, - 0x100f43, 0x1043, - 0x100f62, 0x1062, - 0x100f63, 0x1043, - 0x100f81, 0x1081, - 0x100fa0, 0x10A0, +struct id_mapping { + uint32_t orig_id; + uint16_t new_id; +}; + +static u16 get_equivalent_processor_rev_id(u32 orig_id) { + static const struct id_mapping id_mapping_table[] = { + { 0x100f00, 0x1000 }, + { 0x100f01, 0x1000 }, + { 0x100f02, 0x1000 }, + { 0x100f20, 0x1020 }, + { 0x100f21, 0x1020 }, + { 0x100f2A, 0x1020 }, + { 0x100f22, 0x1022 }, + { 0x100f23, 0x1022 }, + { 0x100f42, 0x1041 }, + { 0x100f43, 0x1043 }, + { 0x100f62, 0x1062 }, + { 0x100f63, 0x1043 }, + { 0x100f81, 0x1081 }, + { 0x100fa0, 0x10A0 }, + + /* Array terminator */ + { 0xffffff, 0x0000 }, }; u32 new_id; @@ -79,9 +88,9 @@ static u32 get_equivalent_processor_rev_id(u32 orig_id) { new_id = 0; - for (i = 0; i < sizeof(id_mapping_table); i += 2 ) { - if(id_mapping_table[i]==orig_id) { - new_id = id_mapping_table[i + 1]; + for (i = 0; id_mapping_table[i].orig_id != 0xffffff; i++ ) { + if (id_mapping_table[i].orig_id == orig_id) { + new_id = id_mapping_table[i].new_id; break; } } |