sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: fix microcode compilation failure in bootblock

Browse Source 
When not building with CONFIG_SSE there are not enough
registers for ROMCC to use for spilling. The previous
changes to this file had too many local variables that
needed to be tracked -- thus causing romcc compilation
issues.

Change-Id: I3dd4b48be707f41ce273285e98ebd397c32a6a25
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/4845
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Aaron Durbin 2014-01-27 15:52:47 -06:00 committed by Aaron Durbin
parent ffa81bf29d
commit e6767674af
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpu/intel/microcode/microcode.c
View File

@ -110,11 +110,10 @@ void intel_microcode_load_unlocked(const void *microcode_patch)
const void *intel_microcode_find(void) const void *intel_microcode_find(void)
{ {
struct cbfs_file *microcode_file; struct cbfs_file *microcode_file;
void *microcode_updates; const struct microcode *ucode_updates;
u32 eax, microcode_len; u32 eax, microcode_len;
u32 pf, rev, sig, update_size; u32 pf, rev, sig, update_size;
unsigned int x86_model, x86_family; unsigned int x86_model, x86_family;
const struct microcode *m;
msr_t msr; msr_t msr;
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
@ -127,7 +126,7 @@ const void *intel_microcode_find(void)
if (!microcode_file) if (!microcode_file)
return NULL; return NULL;
microcode_updates = CBFS_SUBHEADER(microcode_file); ucode_updates = CBFS_SUBHEADER(microcode_file);
microcode_len = ntohl(microcode_file->len); microcode_len = ntohl(microcode_file->len);
/* CPUID sets MSR 0x8B iff a microcode update has been loaded. */ /* CPUID sets MSR 0x8B iff a microcode update has been loaded. */
@ -154,12 +153,11 @@ const void *intel_microcode_find(void)
sig, pf, rev); sig, pf, rev);
#endif #endif
while (microcode_len >= sizeof(*m)) { while (microcode_len >= sizeof(*ucode_updates)) {
m = microcode_updates;
/* Newer microcode updates include a size field, whereas older /* Newer microcode updates include a size field, whereas older
* containers set it at 0 and are exactly 2048 bytes long */ * containers set it at 0 and are exactly 2048 bytes long */
if (m->total_size) { if (ucode_updates->total_size) {
update_size = m->total_size; update_size = ucode_updates->total_size;
} else { } else {
#if !defined(__ROMCC__) #if !defined(__ROMCC__)
printk(BIOS_SPEW, "Microcode size field is 0\n"); printk(BIOS_SPEW, "Microcode size field is 0\n");
@ -175,10 +173,10 @@ const void *intel_microcode_find(void)
break; break;
} }
if ((m->sig == sig) && (m->pf & pf)) if ((ucode_updates->sig == sig) && (ucode_updates->pf & pf))
return m; return ucode_updates;
microcode_updates += update_size; ucode_updates = (void *)((char *)ucode_updates + update_size);
microcode_len -= update_size; microcode_len -= update_size;
} }