summaryrefslogtreecommitdiffstats
path: root/resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-10-18 19:12:53 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-10-18 21:32:36 (EDT)
commit0622df6194dbb1b2120743c0fd1cc5e72c380128 (patch)
tree4c858b8c5667fe001a9907ae0578b4ec28a8f513 /resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch
parent5999dba5f71f1c05040a551d2420ab8c7f3a9da4 (diff)
downloadlibreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.zip
libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.gz
libreboot-0622df6194dbb1b2120743c0fd1cc5e72c380128.tar.bz2
KGPE-D16: update patch set (also update coreboot and vboot)
Also contains other fixes from coreboot, like: * 551cff0 Derive lvds_dual_channel from EDID timings. ^ makes single/dual channel LVDS selection on GM45 automatic * 26fc544 lenovo/t60: Enable native intel gfx init. ^ was being maintained in libreboot, now upstreamed so not needed Framebuffer mode was disabled for the KGPE-D16, because only text-mode works at the moment.
Diffstat (limited to 'resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch')
-rw-r--r--resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch151
1 files changed, 0 insertions, 151 deletions
diff --git a/resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch b/resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch
deleted file mode 100644
index a8005e8..0000000
--- a/resources/libreboot/patch/kgpe-d16/0132-cpu-amd-microcode-Introduce-CBFS-access-spinlock-to-.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 2b8c4a3914e4d0705f10f09ea570e6f8a9d7ef93 Mon Sep 17 00:00:00 2001
-From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: Fri, 28 Aug 2015 20:48:17 -0500
-Subject: [PATCH 132/146] cpu/amd/microcode: Introduce CBFS access spinlock to
- avoid IOMMU failure
-
----
- src/Kconfig | 4 ++++
- src/arch/x86/include/arch/smp/spinlock.h | 7 ++++++-
- src/cpu/amd/microcode/microcode.c | 23 +++++++++++++++++++++++
- src/mainboard/asus/kgpe-d16/Kconfig | 1 +
- src/mainboard/asus/kgpe-d16/romstage.c | 15 ++++++++++++++-
- 5 files changed, 48 insertions(+), 2 deletions(-)
-
-diff --git a/src/Kconfig b/src/Kconfig
-index f1b7ebe..6b0df6a 100644
---- a/src/Kconfig
-+++ b/src/Kconfig
-@@ -455,6 +455,10 @@ config HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK
- bool
- default n
-
-+config HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK
-+ bool
-+ default n
-+
- config HAVE_MONOTONIC_TIMER
- def_bool n
- help
-diff --git a/src/arch/x86/include/arch/smp/spinlock.h b/src/arch/x86/include/arch/smp/spinlock.h
-index cf142a9..291c943 100644
---- a/src/arch/x86/include/arch/smp/spinlock.h
-+++ b/src/arch/x86/include/arch/smp/spinlock.h
-@@ -1,7 +1,10 @@
- #ifndef ARCH_SMP_SPINLOCK_H
- #define ARCH_SMP_SPINLOCK_H
-
--#if !defined(__PRE_RAM__) || defined(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) || defined(CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK)
-+#if !defined(__PRE_RAM__) \
-+ || defined(CONFIG_HAVE_ROMSTAGE_CONSOLE_SPINLOCK) \
-+ || defined(CONFIG_HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK) \
-+ || defined(CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
-
- /*
- * Your basic SMP spinlocks, allowing only a single CPU anywhere
-@@ -16,6 +19,8 @@ spinlock_t* romstage_console_lock(void);
- void initialize_romstage_console_lock(void);
- spinlock_t* romstage_nvram_cbfs_lock(void);
- void initialize_romstage_nvram_cbfs_lock(void);
-+spinlock_t* romstage_microcode_cbfs_lock(void);
-+void initialize_romstage_microcode_cbfs_lock(void);
- #endif
-
- #define SPIN_LOCK_UNLOCKED (spinlock_t) { 1 }
-diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c
-index ce5b08f..fc6b0f2 100644
---- a/src/cpu/amd/microcode/microcode.c
-+++ b/src/cpu/amd/microcode/microcode.c
-@@ -24,6 +24,12 @@
- #include <cpu/amd/microcode.h>
- #include <cbfs.h>
-
-+#ifdef __PRE_RAM__
-+#if IS_ENABLED(CONFIG_HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK)
-+#include <smp/spinlock.h>
-+#endif
-+#endif
-+
- #define UCODE_DEBUG(fmt, args...) \
- do { printk(BIOS_DEBUG, "[microcode] "fmt, ##args); } while(0)
-
-@@ -106,12 +112,29 @@ void amd_update_microcode_from_cbfs(u32 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,
- 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
- }
-diff --git a/src/mainboard/asus/kgpe-d16/Kconfig b/src/mainboard/asus/kgpe-d16/Kconfig
-index 06116a2..5f421db 100644
---- a/src/mainboard/asus/kgpe-d16/Kconfig
-+++ b/src/mainboard/asus/kgpe-d16/Kconfig
-@@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
- select PARALLEL_CPU_INIT
- select HAVE_ROMSTAGE_CONSOLE_SPINLOCK
- select HAVE_ROMSTAGE_NVRAM_CBFS_SPINLOCK
-+ select HAVE_ROMSTAGE_MICROCODE_CBFS_SPINLOCK
- select HAVE_HARD_RESET
- select HAVE_OPTION_TABLE
- select HAVE_CMOS_DEFAULT
-diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
-index 3740bb0..6b5d801 100644
---- a/src/mainboard/asus/kgpe-d16/romstage.c
-+++ b/src/mainboard/asus/kgpe-d16/romstage.c
-@@ -327,6 +327,18 @@ void initialize_romstage_nvram_cbfs_lock(void)
- car_get_var(nvram_cbfs_spinlock) = SPIN_LOCK_UNLOCKED;
- }
-
-+static spinlock_t microcode_cbfs_spinlock CAR_GLOBAL;
-+
-+spinlock_t* romstage_microcode_cbfs_lock(void)
-+{
-+ return car_get_var_ptr(&microcode_cbfs_spinlock);
-+}
-+
-+void initialize_romstage_microcode_cbfs_lock(void)
-+{
-+ car_get_var(microcode_cbfs_spinlock) = SPIN_LOCK_UNLOCKED;
-+}
-+
- void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
- {
- uint32_t esp;
-@@ -348,9 +360,10 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
- timestamp_init(timestamp_get());
- timestamp_add_now(TS_START_ROMSTAGE);
-
-- /* Initialize the printk and nvram CBFS spinlocks */
-+ /* Initialize the printk, nvram CBFS, and microcode CBFS spinlocks */
- initialize_romstage_console_lock();
- initialize_romstage_nvram_cbfs_lock();
-+ initialize_romstage_microcode_cbfs_lock();
-
- /* Nothing special needs to be done to find bus 0 */
- /* Allow the HT devices to be found */
---
-1.7.9.5
-