public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Jeff Brasen" <jbrasen@nvidia.com>
To: <devel@edk2.groups.io>
Cc: <Edhaya.Chandran@arm.com>, <gaojie@byosoft.com.cn>,
	<Samer.El-Haj-Mahmoud@arm.com>, <eric.jin@intel.com>,
	<arvinx.chen@intel.com>, Jeff Brasen <jbrasen@nvidia.com>
Subject: [edk2-test][PATCH 1/1] SctPkg: Fix runtime access to boot services functions
Date: Thu, 12 Aug 2021 10:13:20 -0600	[thread overview]
Message-ID: <ae348aeca36e4ef571081843b36d651cc5166507.1628784566.git.jbrasen@nvidia.com> (raw)

SctAPrint uses boot services functions but is called after
ExitBootServices. Replace with call to Printf which is safe for use in
runtime.

Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
 .../SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c     | 52 +++++++++----------
 uefi-sct/SctPkg/SCRT/SCRTDriver/Arm/Dump.c    | 52 +++++++++----------
 .../SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c     | 52 +++++++++----------
 3 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
index cc8d9869..5688849c 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
@@ -26,43 +26,43 @@ Module Name:
 VOID
 DumpRuntimeTable()
 {
-  SctAPrint ("\n================Dump Runtime Table===============\n");
-  SctAPrint ("Header Signature = 0x%x\n", VRT->Hdr.Signature);
+  Printf ("\n================Dump Runtime Table===============\n");
+  Printf ("Header Signature = 0x%x\n", VRT->Hdr.Signature);
 
-  SctAPrint ("\n================GetTime Service==============\n");
-  SctAPrint ("GetTime @ 0x%x\n", VRT->GetTime);
+  Printf ("\n================GetTime Service==============\n");
+  Printf ("GetTime @ 0x%x\n", VRT->GetTime);
 
-  SctAPrint ("\n================SetTime Service==============\n");
-  SctAPrint ("SetTime @ 0x%x\n", VRT->SetTime);
+  Printf ("\n================SetTime Service==============\n");
+  Printf ("SetTime @ 0x%x\n", VRT->SetTime);
 
-  SctAPrint ("\n================GetWakeupTime Service==============\n");
-  SctAPrint ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime);
+  Printf ("\n================GetWakeupTime Service==============\n");
+  Printf ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime);
 
-  SctAPrint ("\n================SetWakeupTime Service==============\n");
-  SctAPrint ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime);
+  Printf ("\n================SetWakeupTime Service==============\n");
+  Printf ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime);
 
-  SctAPrint ("\n================GetVariable Service==============\n");
-  SctAPrint ("GetVariable @ 0x%x\n", VRT->GetVariable);
+  Printf ("\n================GetVariable Service==============\n");
+  Printf ("GetVariable @ 0x%x\n", VRT->GetVariable);
 
-  SctAPrint ("\n================GetNextVariableName Service==============\n");
-  SctAPrint ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName);
+  Printf ("\n================GetNextVariableName Service==============\n");
+  Printf ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName);
 
-  SctAPrint ("\n================SetVariable Service==============\n");
-  SctAPrint ("SetVariable @ 0x%x\n", VRT->SetVariable);
+  Printf ("\n================SetVariable Service==============\n");
+  Printf ("SetVariable @ 0x%x\n", VRT->SetVariable);
 
-  SctAPrint ("\n================GetNextHighMonotonicCount Service==============\n");
-  SctAPrint ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonotonicCount);
+  Printf ("\n================GetNextHighMonotonicCount Service==============\n");
+  Printf ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonotonicCount);
 
-  SctAPrint ("\n================ResetSystem Service==============\n");
-  SctAPrint ("ResetSystem @ 0x%x\n", VRT->ResetSystem);
+  Printf ("\n================ResetSystem Service==============\n");
+  Printf ("ResetSystem @ 0x%x\n", VRT->ResetSystem);
 #if 0
-  SctAPrint ("\n================UpdateCapsule Service==============\n");
-  SctAPrint ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule);
+  Printf ("\n================UpdateCapsule Service==============\n");
+  Printf ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule);
 
-  SctAPrint ("\n================QueryCapsuleCapabilities Service==============\n");
-  SctAPrint ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabilities);
+  Printf ("\n================QueryCapsuleCapabilities Service==============\n");
+  Printf ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabilities);
 
-  SctAPrint ("\n================QueryVariableInfo Service==============\n");
-  SctAPrint ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo);
+  Printf ("\n================QueryVariableInfo Service==============\n");
+  Printf ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo);
 #endif
 }
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Arm/Dump.c b/uefi-sct/SctPkg/SCRT/SCRTDriver/Arm/Dump.c
index 89e03019..47173d45 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Arm/Dump.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Arm/Dump.c
@@ -27,43 +27,43 @@ Module Name:
 VOID
 DumpRuntimeTable()
 {
-  SctAPrint ("\n================Dump Runtime Table===============\n");
-  SctAPrint ("Header Signature = 0x%x\n", VRT->Hdr.Signature);
+  Printf ("\n================Dump Runtime Table===============\n");
+  Printf ("Header Signature = 0x%x\n", VRT->Hdr.Signature);
 
-  SctAPrint ("\n================GetTime Service==============\n");
-  SctAPrint ("GetTime @ 0x%x\n", VRT->GetTime);
+  Printf ("\n================GetTime Service==============\n");
+  Printf ("GetTime @ 0x%x\n", VRT->GetTime);
 
-  SctAPrint ("\n================SetTime Service==============\n");
-  SctAPrint ("SetTime @ 0x%x\n", VRT->SetTime);
+  Printf ("\n================SetTime Service==============\n");
+  Printf ("SetTime @ 0x%x\n", VRT->SetTime);
 
-  SctAPrint ("\n================GetWakeupTime Service==============\n");
-  SctAPrint ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime);
+  Printf ("\n================GetWakeupTime Service==============\n");
+  Printf ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime);
 
-  SctAPrint ("\n================SetWakeupTime Service==============\n");
-  SctAPrint ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime);
+  Printf ("\n================SetWakeupTime Service==============\n");
+  Printf ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime);
 
-  SctAPrint ("\n================GetVariable Service==============\n");
-  SctAPrint ("GetVariable @ 0x%x\n", VRT->GetVariable);
+  Printf ("\n================GetVariable Service==============\n");
+  Printf ("GetVariable @ 0x%x\n", VRT->GetVariable);
 
-  SctAPrint ("\n================GetNextVariableName Service==============\n");
-  SctAPrint ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName);
+  Printf ("\n================GetNextVariableName Service==============\n");
+  Printf ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName);
 
-  SctAPrint ("\n================SetVariable Service==============\n");
-  SctAPrint ("SetVariable @ 0x%x\n", VRT->SetVariable);
+  Printf ("\n================SetVariable Service==============\n");
+  Printf ("SetVariable @ 0x%x\n", VRT->SetVariable);
 
-  SctAPrint ("\n================GetNextHighMonotonicCount Service==============\n");
-  SctAPrint ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonotonicCount);
+  Printf ("\n================GetNextHighMonotonicCount Service==============\n");
+  Printf ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonotonicCount);
 
-  SctAPrint ("\n================ResetSystem Service==============\n");
-  SctAPrint ("ResetSystem @ 0x%x\n", VRT->ResetSystem);
+  Printf ("\n================ResetSystem Service==============\n");
+  Printf ("ResetSystem @ 0x%x\n", VRT->ResetSystem);
 #if 0
-  SctAPrint ("\n================UpdateCapsule Service==============\n");
-  SctAPrint ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule);
+  Printf ("\n================UpdateCapsule Service==============\n");
+  Printf ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule);
 
-  SctAPrint ("\n================QueryCapsuleCapabilities Service==============\n");
-  SctAPrint ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabilities);
+  Printf ("\n================QueryCapsuleCapabilities Service==============\n");
+  Printf ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabilities);
 
-  SctAPrint ("\n================QueryVariableInfo Service==============\n");
-  SctAPrint ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo);
+  Printf ("\n================QueryVariableInfo Service==============\n");
+  Printf ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo);
 #endif
 }
diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
index cc8d9869..5688849c 100644
--- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
+++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
@@ -26,43 +26,43 @@ Module Name:
 VOID
 DumpRuntimeTable()
 {
-  SctAPrint ("\n================Dump Runtime Table===============\n");
-  SctAPrint ("Header Signature = 0x%x\n", VRT->Hdr.Signature);
+  Printf ("\n================Dump Runtime Table===============\n");
+  Printf ("Header Signature = 0x%x\n", VRT->Hdr.Signature);
 
-  SctAPrint ("\n================GetTime Service==============\n");
-  SctAPrint ("GetTime @ 0x%x\n", VRT->GetTime);
+  Printf ("\n================GetTime Service==============\n");
+  Printf ("GetTime @ 0x%x\n", VRT->GetTime);
 
-  SctAPrint ("\n================SetTime Service==============\n");
-  SctAPrint ("SetTime @ 0x%x\n", VRT->SetTime);
+  Printf ("\n================SetTime Service==============\n");
+  Printf ("SetTime @ 0x%x\n", VRT->SetTime);
 
-  SctAPrint ("\n================GetWakeupTime Service==============\n");
-  SctAPrint ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime);
+  Printf ("\n================GetWakeupTime Service==============\n");
+  Printf ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime);
 
-  SctAPrint ("\n================SetWakeupTime Service==============\n");
-  SctAPrint ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime);
+  Printf ("\n================SetWakeupTime Service==============\n");
+  Printf ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime);
 
-  SctAPrint ("\n================GetVariable Service==============\n");
-  SctAPrint ("GetVariable @ 0x%x\n", VRT->GetVariable);
+  Printf ("\n================GetVariable Service==============\n");
+  Printf ("GetVariable @ 0x%x\n", VRT->GetVariable);
 
-  SctAPrint ("\n================GetNextVariableName Service==============\n");
-  SctAPrint ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName);
+  Printf ("\n================GetNextVariableName Service==============\n");
+  Printf ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName);
 
-  SctAPrint ("\n================SetVariable Service==============\n");
-  SctAPrint ("SetVariable @ 0x%x\n", VRT->SetVariable);
+  Printf ("\n================SetVariable Service==============\n");
+  Printf ("SetVariable @ 0x%x\n", VRT->SetVariable);
 
-  SctAPrint ("\n================GetNextHighMonotonicCount Service==============\n");
-  SctAPrint ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonotonicCount);
+  Printf ("\n================GetNextHighMonotonicCount Service==============\n");
+  Printf ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonotonicCount);
 
-  SctAPrint ("\n================ResetSystem Service==============\n");
-  SctAPrint ("ResetSystem @ 0x%x\n", VRT->ResetSystem);
+  Printf ("\n================ResetSystem Service==============\n");
+  Printf ("ResetSystem @ 0x%x\n", VRT->ResetSystem);
 #if 0
-  SctAPrint ("\n================UpdateCapsule Service==============\n");
-  SctAPrint ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule);
+  Printf ("\n================UpdateCapsule Service==============\n");
+  Printf ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule);
 
-  SctAPrint ("\n================QueryCapsuleCapabilities Service==============\n");
-  SctAPrint ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabilities);
+  Printf ("\n================QueryCapsuleCapabilities Service==============\n");
+  Printf ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabilities);
 
-  SctAPrint ("\n================QueryVariableInfo Service==============\n");
-  SctAPrint ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo);
+  Printf ("\n================QueryVariableInfo Service==============\n");
+  Printf ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo);
 #endif
 }
-- 
2.25.1


             reply	other threads:[~2021-08-12 16:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-12 16:13 Jeff Brasen [this message]
2021-08-12 17:22 ` [edk2-test][PATCH 1/1] SctPkg: Fix runtime access to boot services functions Samer El-Haj-Mahmoud
2021-08-20  7:18 ` G Edhaya Chandran
2021-08-23 14:41   ` G Edhaya Chandran

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=ae348aeca36e4ef571081843b36d651cc5166507.1628784566.git.jbrasen@nvidia.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