From: Laszlo Ersek <lersek@redhat.com>
To: edk2-devel-01 <edk2-devel@lists.01.org>
Cc: Brijesh Singh <brijesh.singh@amd.com>,
Jordan Justen <jordan.l.justen@intel.com>
Subject: [PATCH 02/11] OvmfPkg/BaseMemEncryptSevLib: break DEBUG calls to multiple lines
Date: Wed, 30 Aug 2017 17:53:08 +0200 [thread overview]
Message-ID: <20170830155317.30917-3-lersek@redhat.com> (raw)
In-Reply-To: <20170830155317.30917-1-lersek@redhat.com>
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>
---
OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c | 68 ++++++++++++++------
1 file changed, 48 insertions(+), 20 deletions(-)
diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
index dbaad7766dbe..83e3d8992173 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);
--
2.14.1.3.gb7cf6e02401b
next prev parent reply other threads:[~2017-08-30 15:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-30 15:53 [PATCH 00/11] OvmfPkg: improve SEV-related DEBUG messages Laszlo Ersek
2017-08-30 15:53 ` [PATCH 01/11] OvmfPkg/BaseMemEncryptSevLib: unify encrypt/decrypt " Laszlo Ersek
2017-08-30 15:53 ` Laszlo Ersek [this message]
2017-08-30 15:53 ` [PATCH 03/11] OvmfPkg/BaseMemEncryptSevLib: clean up DEBUG prefixes Laszlo Ersek
2017-08-30 15:53 ` [PATCH 04/11] OvmfPkg/BaseMemEncryptSevLib: clean up debug logging of PhysicalAddress Laszlo Ersek
2017-08-30 15:53 ` [PATCH 05/11] OvmfPkg/BaseMemEncryptSevLib: promote DEBUG_WARN levels to DEBUG_ERROR Laszlo Ersek
2017-08-30 15:53 ` [PATCH 06/11] OvmfPkg/BaseMemEncryptSevLib: clean up upper-case / lower-case in DEBUGs Laszlo Ersek
2017-08-30 15:53 ` [PATCH 07/11] OvmfPkg/BaseMemEncryptSevLib: fix typos in DEBUG messages Laszlo Ersek
2017-08-30 15:53 ` [PATCH 08/11] OvmfPkg/IoMmuDxe: IoMmuMap(): log nicer and more informative DEBUG msgs Laszlo Ersek
2017-08-30 15:53 ` [PATCH 09/11] OvmfPkg/IoMmuDxe: IoMmuUnmap(): clean up DEBUG message Laszlo Ersek
2017-08-30 15:53 ` [PATCH 10/11] OvmfPkg/IoMmuDxe: IoMmuAllocateBuffer(): nicer and more informative DEBUGs Laszlo Ersek
2017-08-30 15:53 ` [PATCH 11/11] OvmfPkg/IoMmuDxe: IoMmuFreeBuffer(): clean up DEBUG message Laszlo Ersek
2017-08-31 15:14 ` [PATCH 00/11] OvmfPkg: improve SEV-related DEBUG messages Brijesh Singh
2017-09-01 12:23 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170830155317.30917-3-lersek@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox