diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-01 22:13:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-01 22:13:34 -0400 |
| commit | ac378bb05fa3cac3197085431f577e0dbddd4b4a (patch) | |
| tree | aa16e2990b97bd5d2f1358a63e906963a55bc8ce /arch/x86/cpu | |
| parent | 168de20f3b6ccefef0ff5757fa5310f47a95c2f0 (diff) | |
| parent | 40144260a9c8c5228500824ad9b7b19597a4bb0b (diff) | |
| download | u-boot-midas-ac378bb05fa3cac3197085431f577e0dbddd4b4a.tar.gz u-boot-midas-ac378bb05fa3cac3197085431f577e0dbddd4b4a.tar.bz2 u-boot-midas-ac378bb05fa3cac3197085431f577e0dbddd4b4a.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/coreboot/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/intel_common/car.S | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/intel_common/microcode.c | 10 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/Kconfig | 1 |
4 files changed, 11 insertions, 3 deletions
diff --git a/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig index fa3b64f2bb..392c258945 100644 --- a/arch/x86/cpu/coreboot/Kconfig +++ b/arch/x86/cpu/coreboot/Kconfig @@ -10,6 +10,7 @@ config SYS_COREBOOT imply MMC_PCI imply MMC_SDHCI imply MMC_SDHCI_SDMA + imply SCSI imply SCSI_AHCI imply SPI_FLASH imply SYS_NS16550 diff --git a/arch/x86/cpu/intel_common/car.S b/arch/x86/cpu/intel_common/car.S index fe8dfbc9ca..52a77bb2d1 100644 --- a/arch/x86/cpu/intel_common/car.S +++ b/arch/x86/cpu/intel_common/car.S @@ -239,4 +239,6 @@ _dt_ucode_base_size: .globl ucode_base ucode_base: /* Declared in microcode.h */ .long 0 /* microcode base */ +.globl ucode_size +ucode_size: /* Declared in microcode.h */ .long 0 /* microcode size */ diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index 11b1ec8955..c7a539d281 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -43,8 +43,6 @@ static int microcode_decode_node(const void *blob, int node, update->data = fdt_getprop(blob, node, "data", &update->size); if (!update->data) return -ENOENT; - update->data += UCODE_HEADER_LEN; - update->size -= UCODE_HEADER_LEN; update->header_version = fdtdec_get_int(blob, node, "intel,header-version", 0); @@ -124,6 +122,7 @@ static void microcode_read_cpu(struct microcode_update *cpu) int microcode_update_intel(void) { struct microcode_update cpu, update; + ulong address; const void *blob = gd->fdt_blob; int skipped; int count; @@ -167,7 +166,8 @@ int microcode_update_intel(void) skipped++; continue; } - wrmsr(MSR_IA32_UCODE_WRITE, (ulong)update.data, 0); + address = (ulong)update.data + UCODE_HEADER_LEN; + wrmsr(MSR_IA32_UCODE_WRITE, address, 0); rev = microcode_read_rev(); debug("microcode: updated to revision 0x%x date=%04x-%02x-%02x\n", rev, update.date_code & 0xffff, @@ -178,5 +178,9 @@ int microcode_update_intel(void) return -EFAULT; } count++; + if (!ucode_base) { + ucode_base = (ulong)update.data; + ucode_size = update.size; + } } while (1); } diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index 31428dd0a0..fdf558d660 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -7,6 +7,7 @@ config QEMU select ARCH_EARLY_INIT_R imply AHCI_PCI imply E1000 + imply SCSI imply SCSI_AHCI imply SYS_NS16550 imply USB |