From: "Zhiguang Liu" <zhiguang.liu@intel.com>
To: devel@edk2.groups.io
Cc: Jordan Justen <jordan.l.justen@intel.com>,
Andrew Fish <afish@apple.com>, Ray Ni <ray.ni@intel.com>
Subject: [PATCH] EmulatorPkg: Fix bugs about MiscBootServices
Date: Fri, 24 May 2019 16:17:43 +0800 [thread overview]
Message-ID: <20190524081743.18780-1-zhiguang.liu@intel.com> (raw)
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1757
This patch fix two issues.
1.
The previous code "NanoSecondDelay (MicroSeconds * 1000)"
may cause data overflow.
2.
Delete some code in
/EmulatorPkg/ResetRuntimeDxe/Reset.c
which may cause Tpl problems when invoked by watchdog.
I think it is ok to delete these code, because it will
be more like what NT32 does.
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
---
EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c | 14 +++++++++++++-
EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c | 14 +++++++++++++-
EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c | 14 +++++++++++++-
EmulatorPkg/ResetRuntimeDxe/Reset.c | 24 ------------------------
4 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
index c331cbba9c..813963de7b 100644
--- a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
+++ b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c
@@ -33,7 +33,19 @@ MicroSecondDelay (
IN UINTN MicroSeconds
)
{
- return NanoSecondDelay (MicroSeconds * 1000);
+ UINTN Remainder;
+ UINTN Counter;
+ UINTN Index;
+ Counter = (UINTN) DivU64x32Remainder (
+ MultU64x32 (MicroSeconds, 1000),
+ 0xffffffff,
+ &Remainder
+ );
+ for (Index = 0; Index < Counter; Index++) {
+ NanoSecondDelay (0xffffffff);
+ }
+ NanoSecondDelay (Remainder);
+ return MicroSeconds;
}
diff --git a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
index 14cae4214c..590ce55fae 100644
--- a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
+++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c
@@ -64,7 +64,19 @@ MicroSecondDelay (
IN UINTN MicroSeconds
)
{
- return NanoSecondDelay (MicroSeconds * 1000);
+ UINTN Remainder;
+ UINTN Counter;
+ UINTN Index;
+ Counter = (UINTN) DivU64x32Remainder (
+ MultU64x32 (MicroSeconds, 1000),
+ 0xffffffff,
+ &Remainder
+ );
+ for (Index = 0; Index < Counter; Index++) {
+ NanoSecondDelay (0xffffffff);
+ }
+ NanoSecondDelay (Remainder);
+ return MicroSeconds;
}
diff --git a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
index cce46fb366..dcac32a51f 100644
--- a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
+++ b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c
@@ -30,7 +30,19 @@ MicroSecondDelay (
IN UINTN MicroSeconds
)
{
- return NanoSecondDelay (MicroSeconds * 1000);
+ UINTN Remainder;
+ UINTN Counter;
+ UINTN Index;
+ Counter = (UINTN) DivU64x32Remainder (
+ MultU64x32 (MicroSeconds, 1000),
+ 0xffffffff,
+ &Remainder
+ );
+ for (Index = 0; Index < Counter; Index++) {
+ NanoSecondDelay (0xffffffff);
+ }
+ NanoSecondDelay (Remainder);
+ return MicroSeconds;
}
/**
diff --git a/EmulatorPkg/ResetRuntimeDxe/Reset.c b/EmulatorPkg/ResetRuntimeDxe/Reset.c
index 19504825c9..9439f9ccff 100644
--- a/EmulatorPkg/ResetRuntimeDxe/Reset.c
+++ b/EmulatorPkg/ResetRuntimeDxe/Reset.c
@@ -29,30 +29,6 @@ EmuResetSystem (
IN VOID *ResetData OPTIONAL
)
{
- EFI_STATUS Status;
- UINTN HandleCount;
- EFI_HANDLE *HandleBuffer;
- UINTN Index;
-
- //
- // Disconnect all
- //
- Status = gBS->LocateHandleBuffer (
- AllHandles,
- NULL,
- NULL,
- &HandleCount,
- &HandleBuffer
- );
- if (!EFI_ERROR (Status)) {
- for (Index = 0; Index < HandleCount; Index++) {
- Status = gBS->DisconnectController (HandleBuffer[Index], NULL, NULL);
- }
-
- gBS->FreePool (HandleBuffer);
- }
-
-
//
// Discard ResetType, always return 0 as exit code
//
--
2.21.0.windows.1
next reply other threads:[~2019-05-24 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-24 8:17 Zhiguang Liu [this message]
2019-05-24 9:08 ` [PATCH] EmulatorPkg: Fix bugs about MiscBootServices Ni, Ray
2019-05-27 0:31 ` Zhiguang Liu
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=20190524081743.18780-1-zhiguang.liu@intel.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