From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web10.605.1579023734950882642 for ; Tue, 14 Jan 2020 09:42:15 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=IdIGbAR7; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f66.google.com with SMTP id p9so14869907wmc.2 for ; Tue, 14 Jan 2020 09:42:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4F/WuzijC8H+hov22bHMyL4aECtGerh6CwO2n7AXPSA=; b=IdIGbAR7TT7sejtityrWAlADcfKQCa3XCgKAKmww069CPFqjwXU5Z91N1lMvVZSm24 TRgUxQ68hcDTwWftqCs5wdCbJyx0GUOvF8GsFobDk/RM89Z9ez0ItTdvgJbruoliCkes Tbgkp62fIvERHWVkm7vuC25AXnLwVX4XnmHPsLZ/kV5Dm9tTkEFisH9/ayiaKi1/vayB hH6VKjS4QVwfGFFuTXIG/DfCKB5Vcw0zwpAoovQboBoU6B7y3fQfNnZHZs1+ifAkW611 kNXj1d5TTUFW0vuSBWBYJg70j9c0EeUV22heo9Z0UZ6PJYvmYZ89IlPYa39VrxS8wYxJ LSRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4F/WuzijC8H+hov22bHMyL4aECtGerh6CwO2n7AXPSA=; b=NTuDRnytbDZm1EIsOEFQr4dRYTxvlA9gWectKJ1DN7QjxhWOYm8RUfvP46vRA/uGPn uK3GhhN2vFfpJqO0P0JZMbyHJdtSLIhTBukLsB2rLFdqQRKhaTUhb02uvvzQDFLSFGRY 1uEM9pM24lijKJGL3SCV4BVANNumK/Dp10qVg9YUMNb/4T9558xaoDPz1LYA9xotBvYk 77wDCF++2gHNsl0Mfme4I1zN4aR3lSj2tOqlHpehicpnE7vO6O0V2Vn+yj6RPp53rh7M 8yXeDHaZjxC7Yq+r9qGWtaG86bRw+Y9JvPPDOCkzuOMPmeH05bvGFJnZ6szoTuhXOdVZ Mbfw== X-Gm-Message-State: APjAAAX1GkgjIRb0mOAFRqnyMIL8CtVl5Ik77KuNCv8J4Bxrrk2BVTGC 2jp1iePdLVSFZtxF48EtwnEp8qrnEjm3kdB6ymJWmw== X-Google-Smtp-Source: APXvYqyzsli92Byl8Nh8QiySzN+91aXL5aFkOOtt0znS0p4OIvB1fsP5SOakA1dhiq4UT6Z8F7jkS/9mu7xmMSE1KZ8= X-Received: by 2002:a1c:a795:: with SMTP id q143mr27411848wme.52.1579023733495; Tue, 14 Jan 2020 09:42:13 -0800 (PST) MIME-Version: 1.0 References: <20200107092215.3271-1-ard.biesheuvel@linaro.org> <20200107092215.3271-2-ard.biesheuvel@linaro.org> <20200114171856.GA20629@bivouac.eciton.net> In-Reply-To: <20200114171856.GA20629@bivouac.eciton.net> From: "Ard Biesheuvel" Date: Tue, 14 Jan 2020 18:42:02 +0100 Message-ID: Subject: Re: [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () To: Leif Lindholm Cc: edk2-devel-groups-io Content-Type: text/plain; charset="UTF-8" On Tue, 14 Jan 2020 at 18:18, Leif Lindholm 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 > > --- > > 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 > > > > -#include > > -#include > > #include > > #include > > #include > > -#include > > -#include > > +#include > > 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 ) > 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 > > > > @@ -76,8 +73,6 @@ ResetShutdown ( > > ArmCallSmc (&ArmSmcArgs); > > } > > > > -VOID DisableMmuAndReenterPei (VOID); > > - > > /** > > This function causes the system to enter S3 and then wake up immediately. > >