diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2017-08-30 13:08:11 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2017-09-01 14:20:24 +0200 |
| commit | 6692af92b19c37525c10b769c4c69d9ee5a2c319 (patch) | |
| tree | 93be325c574dad240095c4aada5c244438521766 | |
| parent | 70063aecde89563433231bc1ed9efb9cdffa3dd5 (diff) | |
| download | edk2-6692af92b19c37525c10b769c4c69d9ee5a2c319.tar.gz edk2-6692af92b19c37525c10b769c4c69d9ee5a2c319.tar.bz2 edk2-6692af92b19c37525c10b769c4c69d9ee5a2c319.zip | |
OvmfPkg/BaseMemEncryptSevLib: break DEBUG calls to multiple lines
None of the DEBUG macro invocations in SetMemoryEncDec() fit on a single
line. Break them to multiple lines, for (a) conforming to the coding style
spec, (b) easier modification in later patches.
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
Tested-by: Brijesh Singh <brijesh.singh@amd.com>
| -rw-r--r-- | OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c | 68 |
1 files changed, 48 insertions, 20 deletions
diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c index dbaad7766d..83e3d89921 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c @@ -286,18 +286,26 @@ SetMemoryEncDec ( PageMapLevel4Entry = (VOID*) (Cr3BaseAddress & ~PgTableMask);
PageMapLevel4Entry += PML4_OFFSET(PhysicalAddress);
if (!PageMapLevel4Entry->Bits.Present) {
- DEBUG ((DEBUG_WARN,
- "%a:%a ERROR bad PML4 for %lx\n", gEfiCallerBaseName, __FUNCTION__,
- PhysicalAddress));
+ DEBUG ((
+ DEBUG_WARN,
+ "%a:%a ERROR bad PML4 for %lx\n",
+ gEfiCallerBaseName,
+ __FUNCTION__,
+ PhysicalAddress
+ ));
return RETURN_NO_MAPPING;
}
PageDirectory1GEntry = (VOID*) ((PageMapLevel4Entry->Bits.PageTableBaseAddress<<12) & ~PgTableMask);
PageDirectory1GEntry += PDP_OFFSET(PhysicalAddress);
if (!PageDirectory1GEntry->Bits.Present) {
- DEBUG ((DEBUG_WARN,
- "%a:%a ERROR bad PDPE for %lx\n", gEfiCallerBaseName,
- __FUNCTION__, PhysicalAddress));
+ DEBUG ((
+ DEBUG_WARN,
+ "%a:%a ERROR bad PDPE for %lx\n",
+ gEfiCallerBaseName,
+ __FUNCTION__,
+ PhysicalAddress
+ ));
return RETURN_NO_MAPPING;
}
@@ -311,17 +319,25 @@ SetMemoryEncDec ( //
if (!(PhysicalAddress & (BIT30 - 1)) && Length >= BIT30) {
SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode);
- DEBUG ((DEBUG_VERBOSE,
- "%a:%a Updated 1GB entry for %lx\n", gEfiCallerBaseName,
- __FUNCTION__, PhysicalAddress));
+ DEBUG ((
+ DEBUG_VERBOSE,
+ "%a:%a Updated 1GB entry for %lx\n",
+ gEfiCallerBaseName,
+ __FUNCTION__,
+ PhysicalAddress
+ ));
PhysicalAddress += BIT30;
Length -= BIT30;
} else {
//
// We must split the page
//
- DEBUG ((DEBUG_VERBOSE,
- "%a:%a Spliting 1GB page\n", gEfiCallerBaseName, __FUNCTION__));
+ DEBUG ((
+ DEBUG_VERBOSE,
+ "%a:%a Spliting 1GB page\n",
+ gEfiCallerBaseName,
+ __FUNCTION__
+ ));
Split1GPageTo2M(((UINT64)PageDirectory1GEntry->Bits.PageTableBaseAddress)<<30, (UINT64*) PageDirectory1GEntry, 0, 0);
continue;
}
@@ -333,9 +349,13 @@ SetMemoryEncDec ( PageDirectory2MEntry = (VOID*) ((PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress<<12) & ~PgTableMask);
PageDirectory2MEntry += PDE_OFFSET(PhysicalAddress);
if (!PageDirectory2MEntry->Bits.Present) {
- DEBUG ((DEBUG_WARN,
- "%a:%a ERROR bad PDE for %lx\n", gEfiCallerBaseName, __FUNCTION__,
- PhysicalAddress));
+ DEBUG ((
+ DEBUG_WARN,
+ "%a:%a ERROR bad PDE for %lx\n",
+ gEfiCallerBaseName,
+ __FUNCTION__,
+ PhysicalAddress
+ ));
return RETURN_NO_MAPPING;
}
//
@@ -354,9 +374,13 @@ SetMemoryEncDec ( //
// We must split up this page into 4K pages
//
- DEBUG ((DEBUG_VERBOSE,
- "%a:%a Spliting 2MB page at %lx\n", gEfiCallerBaseName,__FUNCTION__,
- PhysicalAddress));
+ DEBUG ((
+ DEBUG_VERBOSE,
+ "%a:%a Spliting 2MB page at %lx\n",
+ gEfiCallerBaseName,
+ __FUNCTION__,
+ PhysicalAddress
+ ));
Split2MPageTo4K (((UINT64)PageDirectory2MEntry->Bits.PageTableBaseAddress) << 21, (UINT64*) PageDirectory2MEntry, 0, 0);
continue;
}
@@ -365,9 +389,13 @@ SetMemoryEncDec ( PageTableEntry = (VOID*) (PageDirectoryPointerEntry->Bits.PageTableBaseAddress<<12 & ~PgTableMask);
PageTableEntry += PTE_OFFSET(PhysicalAddress);
if (!PageTableEntry->Bits.Present) {
- DEBUG ((DEBUG_WARN,
- "%a:%a ERROR bad PTE for %lx\n", gEfiCallerBaseName,
- __FUNCTION__, PhysicalAddress));
+ DEBUG ((
+ DEBUG_WARN,
+ "%a:%a ERROR bad PTE for %lx\n",
+ gEfiCallerBaseName,
+ __FUNCTION__,
+ PhysicalAddress
+ ));
return RETURN_NO_MAPPING;
}
SetOrClearCBit (&PageTableEntry->Uint64, Mode);
|