tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 15:14:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/CpuDxe: make register access more readable

Browse Source 
Update code to use more meaningful constant macro or predefined
register structure.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Jian J Wang 2018-03-30 22:25:56 +08:00 committed by Star Zeng
parent 2a1408d1d7
commit d106cf71ea
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
UefiCpuPkg/CpuDxe/CpuPageTable.c
View File

@ -24,10 +24,20 @@
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Protocol/MpService.h> #include <Protocol/MpService.h>
#include <Protocol/SmmBase2.h> #include <Protocol/SmmBase2.h>
#include <Register/Cpuid.h>
#include <Register/Msr.h>
#include "CpuDxe.h" #include "CpuDxe.h"
#include "CpuPageTable.h" #include "CpuPageTable.h"
///
/// Paging registers
///
#define CR0_WP BIT16
#define CR0_PG BIT31
#define CR4_PSE BIT4
#define CR4_PAE BIT5
/// ///
/// Page Table Entry /// Page Table Entry
/// ///
@ -140,7 +150,8 @@ GetCurrentPagingContext (
) )
{ {
UINT32 RegEax; UINT32 RegEax;
UINT32 RegEdx; CPUID_EXTENDED_CPU_SIG_EDX RegEdx;
MSR_IA32_EFER_REGISTER MsrEfer;
// //
// Don't retrieve current paging context from processor if in SMM mode. // Don't retrieve current paging context from processor if in SMM mode.
@ -152,33 +163,36 @@ GetCurrentPagingContext (
} else { } else {
mPagingContext.MachineType = IMAGE_FILE_MACHINE_I386; mPagingContext.MachineType = IMAGE_FILE_MACHINE_I386;
} }
if ((AsmReadCr0 () & BIT31) != 0) { if ((AsmReadCr0 () & CR0_PG) != 0) {
mPagingContext.ContextData.X64.PageTableBase = (AsmReadCr3 () & PAGING_4K_ADDRESS_MASK_64); mPagingContext.ContextData.X64.PageTableBase = (AsmReadCr3 () & PAGING_4K_ADDRESS_MASK_64);
} else { } else {
mPagingContext.ContextData.X64.PageTableBase = 0; mPagingContext.ContextData.X64.PageTableBase = 0;
} }
if ((AsmReadCr4 () & BIT4) != 0) { if ((AsmReadCr4 () & CR4_PSE) != 0) {
mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PSE; mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PSE;
} }
if ((AsmReadCr4 () & BIT5) != 0) { if ((AsmReadCr4 () & CR4_PAE) != 0) {
mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PAE; mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PAE;
} }
if ((AsmReadCr0 () & BIT16) != 0) { if ((AsmReadCr0 () & CR0_WP) != 0) {
mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_WP_ENABLE; mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_WP_ENABLE;
} }
AsmCpuid (0x80000000, &RegEax, NULL, NULL, NULL); AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL);
if (RegEax > 0x80000000) { if (RegEax >= CPUID_EXTENDED_CPU_SIG) {
AsmCpuid (0x80000001, NULL, NULL, NULL, &RegEdx); AsmCpuid (CPUID_EXTENDED_CPU_SIG, NULL, NULL, NULL, &RegEdx.Uint32);
if ((RegEdx & BIT20) != 0) {
if (RegEdx.Bits.NX != 0) {
// XD supported // XD supported
if ((AsmReadMsr64 (0xC0000080) & BIT11) != 0) { MsrEfer.Uint64 = AsmReadMsr64(MSR_CORE_IA32_EFER);
if (MsrEfer.Bits.NXE != 0) {
// XD activated // XD activated
mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED; mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED;
} }
} }
if ((RegEdx & BIT26) != 0) {
if (RegEdx.Bits.Page1GB != 0) {
mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PAGE_1G_SUPPORT; mPagingContext.ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_PAGE_1G_SUPPORT;
} }
} }
@ -563,7 +577,7 @@ IsReadOnlyPageWriteProtected (
// in this driver. // in this driver.
// //
if (!IsInSmm ()) { if (!IsInSmm ()) {
return ((AsmReadCr0 () & BIT16) != 0); return ((AsmReadCr0 () & CR0_WP) != 0);
} }
return FALSE; return FALSE;
} }
@ -581,7 +595,7 @@ DisableReadOnlyPageWriteProtect (
// in this driver. // in this driver.
// //
if (!IsInSmm ()) { if (!IsInSmm ()) {
AsmWriteCr0 (AsmReadCr0 () & ~BIT16); AsmWriteCr0 (AsmReadCr0 () & ~CR0_WP);
} }
} }
@ -598,7 +612,7 @@ EnableReadOnlyPageWriteProtect (
// in this driver. // in this driver.
// //
if (!IsInSmm ()) { if (!IsInSmm ()) {
AsmWriteCr0 (AsmReadCr0 () | BIT16); AsmWriteCr0 (AsmReadCr0 () | CR0_WP);
} }
} }