Skip to content

Commit

Permalink
SctPkg: Fix runtime access to boot services functions
Browse files Browse the repository at this point in the history 
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>

Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>
Reviewed-by: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
  • Loading branch information
@jbrasen @edhay
jbrasen authored and edhay committed Aug 23, 2021
1 parent 814b2af commit f3b3456
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 78 deletions.
52 changes: 26 additions & 26 deletions uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 @ x%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
}
52 changes: 26 additions & 26 deletions uefi-sct/SctPkg/SCRT/SCRTDriver/Arm/Dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
52 changes: 26 additions & 26 deletions uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit f3b3456

Please sign in to comment.