From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a01:111:f400:fe06::831; helo=eur02-ve1-obe.outbound.protection.outlook.com; envelope-from=marvin.haeuser@outlook.com; receiver=edk2-devel@lists.01.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02olkn0831.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::831]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9E3CE22352281 for ; Tue, 27 Feb 2018 08:44:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=hUnc/wYgnNWr7gHSjFmSXLehhEYYoJYeF8Bse3EU7qY=; b=DZO0r2peE8/agQFkpmjd2SMEwW/2+NHe789lIexCpc21UpLBMsLhNBnl7ilvUtyaD9fI/ufXzzH0VQ+oElPTSuhbRA+NUdtNF6B5nCTnyht/Dk79cn6URQFYo/qKL/Uy5KKnZbURpRzhY5UWJaW3NKOqn3T7JOgvwQCNmIv++Gxf0g/u8gauOTtzAnNoR2OgCqnJuQjkOmGoKSBz3503UBTB9lPdD5fgzOFJmvl3hA/hly3W4hyq2hCWviJFuIjQ4R49QOoGB4ZvNqMZNhq8qXYgYa16R8IMS5PVONxTgjq6RhnOdjupIs/1keXMqvggHbbionpqUZRjrfpwVTMR5g== Received: from VE1EUR02FT055.eop-EUR02.prod.protection.outlook.com (10.152.12.60) by VE1EUR02HT243.eop-EUR02.prod.protection.outlook.com (10.152.13.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.485.12; Tue, 27 Feb 2018 16:51:00 +0000 Received: from AM4PR06MB1491.eurprd06.prod.outlook.com (10.152.12.60) by VE1EUR02FT055.mail.protection.outlook.com (10.152.13.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15 via Frontend Transport; Tue, 27 Feb 2018 16:50:59 +0000 Received: from AM4PR06MB1491.eurprd06.prod.outlook.com ([fe80::7d81:9d96:1051:d20d]) by AM4PR06MB1491.eurprd06.prod.outlook.com ([fe80::7d81:9d96:1051:d20d%14]) with mapi id 15.20.0527.021; Tue, 27 Feb 2018 16:50:59 +0000 From: =?iso-8859-1?Q?Marvin_H=E4user?= To: "edk2-devel@lists.01.org" CC: "eric.dong@intel.com" , "lersek@redhat.com" Thread-Topic: [PATCH] UefiCpuPkg/SecMain: Add NORETURN decorator to SecStartup(). Thread-Index: AQHTr+sk1NCrgKSdsUatxkEixevNTQ== Date: Tue, 27 Feb 2018 16:50:59 +0000 Message-ID: Accept-Language: de-DE, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:F9BB366E779ED76050B6EDD173FA11C1CA1D3060D9EE1FF30BDC40C789CB0ED6; UpperCasedChecksum:8EC6E1AF70792732A5DE96DDFF21EC854F0DB922CEFE1348C17A7EBAE2192CCF; SizeAsReceived:7092; Count:45 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [h7VSY5CVJGW0L9rWZ7G2ycKEAVaXbIv7] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR02HT243; 6:TIjI+MdheryKOoQb5NFR8ph76M61SCUHT8VvGY66w+UDqaMf23jyWUzOdi/vLccs73x9YuCP/47nBviL1ME9AwHORHnqNZJB7uHeL0KB37FOOBJ+ecZqpQZjcyZd/EbLjE87eTKGfMaMNN+x6rYZyhpOZyy9zr+RYsCTJo81+/G4pWH7EFTKd4ZIAoxHRKGtYgDTXvLHsFFpY2z+gokQWYYVNkg05UKczrgzud44ZXyfb2anSS2ScW3bVdQtD7nK6Sq3RGR/J4vfewAxqVXNIbVgbL+fIgovmebq4mOWvQMpyyVPRAcESmqZFTTZraSzWeq4GUkZ9cu4yQR8w7prbPJRzcAbpsCrnv5LrOIOZTY=; 5:X++GAzDsuI2o4ik5TRZa1zI/zsF62kkBTGRjErH80bRHYWMAvzJSK4yf6h/IMzAvVCb8usS91EPi7g4OPV8GNaNz7+S+irZddrML+RX2Tvo6UdOoOa3fOk9Kq4/HvV8FCbRMAVAueiJytUN1MQQv+oh+VVeFPWiVD1YpBQ5LPnQ=; 24:7rPiojCvUEaeBbhVQTob92OPvinzBWDGKHS2K7oXoSvOugwxXffWQ2R9YG3eKVIMcIlds3ld8OnHIb75q+esnoiQ9OzhpvBKnrzboSbVjs4=; 7:JYZKqk9pRopXrROD2SISrCdcLn6kcEtds5M4JyGaz8l5nx2yS9m/Va8rh356Dawmrv48jOd8kbGk22qHZjHOqdObc8E9M4LQM9akvgRpFLmpYgmhkgjFj7Ee5HhzBQMcnZYIWStereG9l1umc7WSrwH+gP28trBWw4wrYrUB/+OEivWupfehlAcVvcW1gj90eZisifBkM6Cq2nHRmc/WQTohKYRknEQ+L9hTC0vtWXN4h/lMg42BJHoWNh3O5LzJ x-incomingheadercount: 45 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:VE1EUR02HT243; x-ms-traffictypediagnostic: VE1EUR02HT243: x-ms-office365-filtering-correlation-id: d1d19389-a0c2-4e8e-fdb8-08d57e024701 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR02HT243; BCL:0; PCL:0; RULEID:; SRVR:VE1EUR02HT243; x-forefront-prvs: 05961EBAFC x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR02HT243; H:AM4PR06MB1491.eurprd06.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1d19389-a0c2-4e8e-fdb8-08d57e024701 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2018 16:50:59.5390 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR02HT243 Subject: [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 16:44:57 -0000 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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 phase= s before memory ready. // InitializeDebugAgent (DEBUG_AGENT_INIT_PREMEM_SEC, &SecCoreData, SecStar= tupPhase2); + + // + // Should not come here. + // + UNREACHABLE (); } =20 /** 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, --=20 2.16.0.windows.2