diff options
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/biosvar.h | 9 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpufunc.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/specialreg.h | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h index df903be32b3..94a7df3140f 100644 --- a/sys/arch/i386/include/biosvar.h +++ b/sys/arch/i386/include/biosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosvar.h,v 1.66 2017/06/20 12:39:20 tom Exp $ */ +/* $OpenBSD: biosvar.h,v 1.67 2018/08/23 14:47:52 jsg Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -238,6 +238,12 @@ typedef struct _bios_efiinfo { uint32_t fb_reserved_mask; } __packed bios_efiinfo_t; +#define BOOTARG_UCODE 12 +typedef struct _bios_ucode { + uint64_t uc_addr; + uint64_t uc_size; +} __packed bios_ucode_t; + #if defined(_KERNEL) || defined (_STANDALONE) #ifdef _LOCORE @@ -289,6 +295,7 @@ void bios32_cleanup(void); extern u_int bootapiver; extern bios_memmap_t *bios_memmap; extern bios_efiinfo_t *bios_efiinfo; +extern bios_ucode_t *bios_ucode; extern void *bios_smpinfo; extern bios_pciinfo_t *bios_pciinfo; diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h index 4f52ffb6fdd..78d368d9186 100644 --- a/sys/arch/i386/include/cpufunc.h +++ b/sys/arch/i386/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.30 2018/07/30 14:19:12 kettenis Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.31 2018/08/23 14:47:52 jsg Exp $ */ /* $NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $ */ /* @@ -280,6 +280,8 @@ breakpoint(void) } void amd64_errata(struct cpu_info *); +void cpu_ucode_setup(void); +void cpu_ucode_apply(struct cpu_info *); struct cpu_info_full; void cpu_enter_pages(struct cpu_info_full *); diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h index d9d61910933..edef12caf3d 100644 --- a/sys/arch/i386/include/specialreg.h +++ b/sys/arch/i386/include/specialreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: specialreg.h,v 1.70 2018/08/21 12:44:13 jsg Exp $ */ +/* $OpenBSD: specialreg.h,v 1.71 2018/08/23 14:47:52 jsg Exp $ */ /* $NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $ */ /*- @@ -329,6 +329,7 @@ #define P5MSR_CTRSEL 0x011 /* P5 only (trap on P6) */ #define P5MSR_CTR0 0x012 /* P5 only (trap on P6) */ #define P5MSR_CTR1 0x013 /* P5 only (trap on P6) */ +#define MSR_PLATFORM_ID 0x017 /* Platform ID for microcode */ #define MSR_APICBASE 0x01b #define APICBASE_BSP 0x100 #define APICBASE_ENABLE_X2APIC 0x400 |