From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AFDDD209574CE for ; Tue, 27 Feb 2018 09:34:36 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8289240201A5; Tue, 27 Feb 2018 17:40:42 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-21.rdu2.redhat.com [10.10.120.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id E726D76C5; Tue, 27 Feb 2018 17:40:41 +0000 (UTC) To: =?UTF-8?Q?Marvin_H=c3=a4user?= , "edk2-devel@lists.01.org" Cc: "eric.dong@intel.com" References: From: Laszlo Ersek Message-ID: Date: Tue, 27 Feb 2018 18:40:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 27 Feb 2018 17:40:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 27 Feb 2018 17:40:42 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH] UefiCpuPkg/SecMain: Add NORETURN decorator to SecStartup(). X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2018 17:34:37 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 02/27/18 17:50, Marvin Häuser wrote: > The function SecStartup() is not supposed to return. Hence, add the > NORETURN decorator. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marvin Haeuser > --- > UefiCpuPkg/SecCore/SecMain.c | 6 ++++++ > UefiCpuPkg/SecCore/SecMain.h | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/UefiCpuPkg/SecCore/SecMain.c b/UefiCpuPkg/SecCore/SecMain.c > index c241d3704af7..6f9db0584ce1 100644 > --- a/UefiCpuPkg/SecCore/SecMain.c > +++ b/UefiCpuPkg/SecCore/SecMain.c > @@ -113,6 +113,7 @@ SecPerformancePpiCallBack ( > @param BootFirmwareVolume Base address of the Boot Firmware Volume. > **/ > VOID > +NORETURN > EFIAPI > SecStartup ( > IN UINT32 SizeOfRam, > @@ -201,6 +202,11 @@ SecStartup ( > // Initialize Debug Agent to support source level debug in SEC/PEI phases before memory ready. > // > InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, &SecCoreData, SecStartupPhase2); > + > + // > + // Should not come here. > + // > + UNREACHABLE (); > } > > /** > diff --git a/UefiCpuPkg/SecCore/SecMain.h b/UefiCpuPkg/SecCore/SecMain.h > index 46c7d41c6e3e..42a5718cfdd5 100644 > --- a/UefiCpuPkg/SecCore/SecMain.h > +++ b/UefiCpuPkg/SecCore/SecMain.h > @@ -76,6 +76,7 @@ SecTemporaryRamDone ( > @param BootFirmwareVolume Base address of the Boot Firmware Volume. > **/ > VOID > +NORETURN > EFIAPI > SecStartup ( > IN UINT32 SizeOfRam, > I checked the NORETURN and UNREACHABLE() macros in "MdePkg/Include/Base.h", and also the InitializeDebugAgent() API. I think the patch is correct. Reviewed-by: Laszlo Ersek Thanks Laszlo