tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The unit of Duration for S3BootScriptSaveMemPoll() is us, but not ns, so update BootScriptExecuteMemPoll() to use MicroSecondDelay() instead of NanoSecondDelay(), and update BootScriptWriteMemPoll() to use S3BootScriptSaveMemPoll() correctly with possible minimum deviation. 

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14048 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lzeng14 2013-01-15 05:18:19 +00:00
parent 130df89019
commit 30522140a1
3 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptExecute.c
View File

@ -1,7 +1,7 @@
/** @file
Interpret and execute the S3 data in S3 boot script.
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@ -1176,7 +1176,7 @@ BootScriptExecuteMemPoll (
}
for (LoopTimes = 0; LoopTimes < MemPoll.LoopTimes; LoopTimes++) {
NanoSecondDelay ((UINTN)MemPoll.Duration);
MicroSecondDelay ((UINTN)MemPoll.Duration);
Data = 0;
Status = ScriptMemoryRead (

27
MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
View File

@ -1,7 +1,7 @@
/** @file
Implementation for S3 Boot Script Saver state driver.
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@ -344,16 +344,33 @@ BootScriptWriteMemPoll (
VOID *Data;
VOID *DataMask;
UINTN Delay;
UINTN LoopTimes;
UINT32 Remainder;
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, VOID *);
DataMask = VA_ARG (Marker, VOID *);
Delay = (UINTN)VA_ARG (Marker, UINT64);
//
// According to the spec, the interval between 2 pools is 100ns
//
return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 100, Delay);
// According to the spec, the interval between 2 polls is 100ns,
// but the unit of Duration for S3BootScriptSaveMemPoll() is microsecond(1000ns).
// Duration * 1000ns * LoopTimes = Delay * 100ns
// Duration will be minimum 1(microsecond) to be minimum deviation,
// so LoopTimes = Delay / 10.
//
LoopTimes = DivU64x32Remainder (
Delay,
10,
&Remainder
);
if (Remainder != 0) {
//
// If Remainder is not zero, LoopTimes will be rounded up by 1.
//
LoopTimes +=1;
}
return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);
}

27
MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
View File

@ -1,7 +1,7 @@
/** @file
Implementation for S3 SMM Boot Script Saver state driver.
Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@ -343,16 +343,33 @@ BootScriptWriteMemPoll (
VOID *Data;
VOID *DataMask;
UINTN Delay;
UINTN LoopTimes;
UINT32 Remainder;
Width = VA_ARG (Marker, S3_BOOT_SCRIPT_LIB_WIDTH);
Address = VA_ARG (Marker, UINT64);
Data = VA_ARG (Marker, VOID *);
DataMask = VA_ARG (Marker, VOID *);
Delay = (UINTN)VA_ARG (Marker, UINT64);
//
// According to the spec, the interval between 2 pools is 100ns
//
return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 100, Delay);
// According to the spec, the interval between 2 polls is 100ns,
// but the unit of Duration for S3BootScriptSaveMemPoll() is microsecond(1000ns).
// Duration * 1000ns * LoopTimes = Delay * 100ns
// Duration will be minimum 1(microsecond) to be minimum deviation,
// so LoopTimes = Delay / 10.
//
LoopTimes = DivU64x32Remainder (
Delay,
10,
&Remainder
);
if (Remainder != 0) {
//
// If Remainder is not zero, LoopTimes will be rounded up by 1.
//
LoopTimes +=1;
}
return S3BootScriptSaveMemPoll (Width, Address, DataMask, Data, 1, LoopTimes);
}