On Tue, 14 Jan 2020 at 18:18, Leif Lindholm <leif.lindh...@linaro.org> wrote: > > Apologies for late response - only just got email fully back up. > Minor comment below. > > On Tue, Jan 07, 2020 at 10:22:14 +0100, Ard Biesheuvel wrote: > > EnterS3WithImmediateWake () no longer has any callers, so remove it > > from ResetSystemLib. Note that this means the hack to support warm > > reboot by jumping to the SEC entry point with the MMU and caches off > > is also no longer used, and can be removed as well, along with the PCD > > PcdArmReenterPeiForCapsuleWarmReboot that was introduced for this > > purpose. > > > > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > > --- > > ArmPkg/ArmPkg.dec | 4 > > -- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf | 17 > > ----- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c | 66 > > +------------------- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.S | 24 > > ------- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/AArch64/Reset.asm | 29 > > --------- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.S | 23 > > ------- > > ArmPkg/Library/ArmSmcPsciResetSystemLib/Arm/Reset.asm | 28 > > --------- > > 7 files changed, 2 insertions(+), 189 deletions(-) > > > > > diff --git > > a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c > > b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c > > index b2dde9bfc13a..22fcf989e903 100644 > > --- a/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c > > +++ b/ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.c > > @@ -10,13 +10,10 @@ > > > > #include <PiDxe.h> > > > > -#include <Library/ArmMmuLib.h> > > -#include <Library/ArmSmcLib.h> > > #include <Library/BaseLib.h> > > #include <Library/DebugLib.h> > > #include <Library/ResetSystemLib.h> > > -#include <Library/UefiBootServicesTableLib.h> > > -#include <Library/UefiRuntimeLib.h> > > +#include <Library/ArmSmcLib.h> > > Why does ArmSmcLib.h move? > If it is functionally required, then is there a bug in the file? > If not, can it go back to its original spot? > (If it can, and does, Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>) >
I think that was a side effect of the revert. I'll put it back where it was. Thanks, > ((I will keep R-b:ing with that address until Maintainers.txt is > updated.)) > > / > Leif > > > > > #include <IndustryStandard/ArmStdSmc.h> > > > > @@ -76,8 +73,6 @@ ResetShutdown ( > > ArmCallSmc (&ArmSmcArgs); > > } > > > > -VOID DisableMmuAndReenterPei (VOID); > > - > > /** > > This function causes the system to enter S3 and then wake up immediately. > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#53241): https://edk2.groups.io/g/devel/message/53241 Mute This Topic: https://groups.io/mt/69498790/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
