cpu/amd/microcode: Introduce CBFS access spinlock to avoid IOMMU failure
When microcode updates are enabled, this fixes an issue identical
to that described in GIT hash 7b22d84d
:
* drivers/pc80: Add optional spinlock for nvram CBFS access
Change-Id: Ib7e8cb171f44833167053ca98a85cca23021dfba
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: https://review.coreboot.org/12063
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
committed by
Martin Roth
parent
046d217420
commit
c764c7488b
@@ -20,6 +20,7 @@
|
||||
#include <cpu/amd/microcode.h>
|
||||
#include <cbfs.h>
|
||||
#include <arch/io.h>
|
||||
#include <smp/spinlock.h>
|
||||
|
||||
#define UCODE_DEBUG(fmt, args...) \
|
||||
do { printk(BIOS_DEBUG, "[microcode] "fmt, ##args); } while(0)
|
||||
@@ -197,14 +198,30 @@ void amd_update_microcode_from_cbfs(uint32_t equivalent_processor_rev_id)
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef __PRE_RAM__
|
||||
#if IS_ENABLED(CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
|
||||
spin_lock(romstage_microcode_cbfs_lock());
|
||||
#endif
|
||||
#endif
|
||||
|
||||
ucode = cbfs_boot_map_with_leak(microcode_cbfs_file[i],
|
||||
CBFS_TYPE_MICROCODE, &ucode_len);
|
||||
if (!ucode) {
|
||||
UCODE_DEBUG("microcode file not found. Skipping updates.\n");
|
||||
|
||||
#ifdef __PRE_RAM__
|
||||
#if IS_ENABLED(CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
|
||||
spin_unlock(romstage_microcode_cbfs_lock());
|
||||
#endif
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
amd_update_microcode(ucode, ucode_len, equivalent_processor_rev_id);
|
||||
|
||||
#ifdef __PRE_RAM__
|
||||
#if IS_ENABLED(CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
|
||||
spin_unlock(romstage_microcode_cbfs_lock());
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user