From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web12.232.1579022340267136252 for ; Tue, 14 Jan 2020 09:19:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=SfxUIjHa; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: leif.lindholm@linaro.org) Received: by mail-wr1-f68.google.com with SMTP id b6so13012775wrq.0 for ; Tue, 14 Jan 2020 09:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=AelR8M88H65GsosIbJ3BLKKnQez7xO1bMX0lbiLX7Rw=; b=SfxUIjHaIFsuHY9e1e9jW0lfckwg8jSZwTEIHWtOYgbkvpu+h1jfs0kZiI4nT9tuEW HAuyIQtAcrMrI+uoCNse+mDtkrbIp8/mvsjVItyqFtAy1G2n/UBTb7wCDoai1jQfPJao uhRw359kMguE0ugdRs0QP8e6vRcYax6/5jqadEWYp6/0CkAsXm+4mqR9IeTsgiLR0+3w lp2r6bMMEbTk3OhZMJYT8Q6+72XLmLT5sWCektZW0BWs15qwMqXO8eEodnQczv/m8nDJ dw5RltblOC6f8PbVSbWtJvPH++vBgmu565ywqcZV0mMP3w5jXOy8JA2Jk9snvIJAkJjC DHZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=AelR8M88H65GsosIbJ3BLKKnQez7xO1bMX0lbiLX7Rw=; b=Yib3YH9gWQyqIcaz3B2I6SOptwRjtFKebBYw3JJECCRGb46BZ8OftUq9XO508ppC/l hUcye7nJg9cjUjiCytZrVpmRFCGPmTj0aXn/CzPDCnH4Nl1XtTJUXM6C4WgayFaavA3a G70HJSWD3Ijwz1XY6A3/x1ACyAaDVOFmqSUcP1a1i55DIUiOQh5J2iG3C9wvfyziTubV qbwQ99Oo7qHsAImKTLhOPdrsdUH0tOXm35cda2lYX4xMEfJ2XUj+sbMwrJEKjrmtTRxS bPjluSi88ZhO1DttM++e1xUOMu2HsC3wuvQWgbUgqJ1al9iRlWJkABtNcNQp3gZ7+Wrw slbw== X-Gm-Message-State: APjAAAWks587XwV7TJSI+tPUTK1kgEzP0k4TaunIMyyKICxRzIDA0ilL 0UzIQj+++cIcZjhzu0bcWdCu8w== X-Google-Smtp-Source: APXvYqxHgtnRS8p0ltHytHBu0JX5Org5Qu8zyBCg1A85OkETxUKhpOMWBjAYGJZ/+GBKrzw2eR/XUQ== X-Received: by 2002:a5d:404b:: with SMTP id w11mr27230776wrp.171.1579022338587; Tue, 14 Jan 2020 09:18:58 -0800 (PST) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id w8sm19798510wmm.0.2020.01.14.09.18.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jan 2020 09:18:57 -0800 (PST) Date: Tue, 14 Jan 2020 17:18:56 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: devel@edk2.groups.io Subject: Re: [PATCH 1/2] ArmPkg/ArmSmcPsciResetSystemLib: remove EnterS3WithImmediateWake () Message-ID: <20200114171856.GA20629@bivouac.eciton.net> References: <20200107092215.3271-1-ard.biesheuvel@linaro.org> <20200107092215.3271-2-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20200107092215.3271-2-ard.biesheuvel@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 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. >