From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.57]) by mx.groups.io with SMTP id smtpd.web09.14433.1635352399140457483 for ; Wed, 27 Oct 2021 09:33:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=P1/8K8Kb; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.237.57, mailfrom: abdullateef.attar@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bweZjcTRESZ2PiynqPXAnYF+pGcB5nnIh8UfJ6d5edKTxxKvXG4cfJoIi1oBAGNvtyaZk6my8qjeS0G30eI8+J6mHi1e//dZ2TZuWvel9k6TV5gyxMye6e33vlD2cUrLpmH2MAU5+bHlqeiTQ276CYrCGmGqzK4H4ZwDSjMBvC4hl3ncJurfuNE5HN2Y/zZkyfbprs+RUPVLxwRUAs9csZfw5P5hJDpABFA5Ma8cUyR/5V7iKbjeP1Ns7TFTDrS9SiBKVzCEezSjvMUN7XXWgIIAN3ATt+uVFagXUI43HuLoZ/akr5dxRjVnyIlhzBAXz+28ifeDDla6U15Wu/BtQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LWIfvYNjdlgs6PC4SL3Duh4xW8QyJij70pcDfplJm4A=; b=ORX0qUdi1le4EcgvtiWPuqPQODIShrp8uf9FPRBe67IAYHdDph9c1DKqW/uVvRs1JP7kRTlVLPp03bMKLn2fLj6Bf3Te4UQIXnEQqGG24QBPYFckhQN3oFNy1chCNR1WJciXjSLhF0hYIn7SShdZAZWtA4M0/GCwR5yixt59HTmAkQFQ8Hwe/jpqFLKne8iSZyC2ZyqCRWDBWu6H5RDdqBrG92RSmmx7RW4CLzV+3sm9uHwC89h4QZKNAptJAoSZ7OgI9kluiCYnmmPpvSRgNRG5Fbi7l+7YvCg3fOhdDnWO6sjYsqocEEeAkT2nnt63oLFZySTqCcWFWCAi7RPiBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LWIfvYNjdlgs6PC4SL3Duh4xW8QyJij70pcDfplJm4A=; b=P1/8K8Kb6QpGg240lWUsOGMrsvOpXwGPcgVRPaXvULQef3YJsztpixXH3XUuUip9cK6YFdg1apN/sHbZ85pDR8XI6eQkwJyW/UrtC71JV0slkEsT+wkpE3yEVBB+DCjFCwJo9fqT4UpwhZELq7vUHnExRuNUlo9VcuCzUjbl8ZE= Received: from BN9PR12MB5225.namprd12.prod.outlook.com (2603:10b6:408:11e::8) by BN9PR12MB5193.namprd12.prod.outlook.com (2603:10b6:408:11a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Wed, 27 Oct 2021 16:33:16 +0000 Received: from BN9PR12MB5225.namprd12.prod.outlook.com ([fe80::14b8:a8a2:a20c:a152]) by BN9PR12MB5225.namprd12.prod.outlook.com ([fe80::14b8:a8a2:a20c:a152%5]) with mapi id 15.20.4649.015; Wed, 27 Oct 2021 16:33:16 +0000 From: "Attar, AbdulLateef (Abdul Lateef)" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , Liming Gao , "Dong, Eric" Subject: Re: [edk2-devel] [edk2-platforms] [PATCH v1 1/2] MinPlatformPkg: Update APIC Table based on mode Thread-Topic: [edk2-devel] [edk2-platforms] [PATCH v1 1/2] MinPlatformPkg: Update APIC Table based on mode Thread-Index: AQHXywr6lROiXhb400mobl7gyvU9havnCHZQ Date: Wed, 27 Oct 2021 16:33:16 +0000 Message-ID: References: <20211022144746.10671-1-abdattar@amd.com> <20211022144746.10671-2-abdattar@amd.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_Enabled=true; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_SetDate=2021-10-27T16:33:13Z; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_Method=Privileged; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_Name=Public-AIP 2.0; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_ActionId=0e55ceea-b239-42c3-9b24-7ff200cc5673; MSIP_Label_d4243a53-6221-4f75-8154-e4b33a5707a1_ContentBits=1 authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=amd.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e335ed9a-ae43-4d2f-ba03-08d999677aa8 x-ms-traffictypediagnostic: BN9PR12MB5193: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: QhxgrDz4oYL/EAlwbG88zCTRBCy1i41xVJ8gtqLgCfe1xclYU6/4IaQGb++YMPuSe8bzKv7mFzCpCDqpm22AN4NsZK2NMXTo7rU5+3B6T6+7PXSkWQb9RqJUpuLuyUpKZm0Xt5Y9mzKGf3/I0XM4UwVKd2K7QXN1C6hbQ5pAGVAoXo1uF926/0Eo+ojCviQ9Jp5qUdp9WgkqNjUCV9EnmN1gYmFB1Qsw3kXSUDWX65q63AqK7CNGAGopaLTOAroou5JutNKjfCRioAObqZSaAsWUipEKD1HV0do0sRnAdilR6PyZ+dwj7NpCRg2+nskt7j3VKxVup4g5RWJm3yxM21H/UBkn25/2K6hlsKPQ4lEKvxBUQou4AyntIw+BB2ImaDamByu3NJxvIUgCs7b40KRgaYwwy/jEDPiRifiBh2E9xhr5meIQ5f9unToZSlaA2THFrqETXHGoQ3ktbcU+U1HwuXTZKZ8TwRr77NU8itqkPvzyTro07CGyxW2r84RVCsOJuWnJFWNSpHSMUa0+hrnKWZ0/WxYni4MZQd6GI2zN891S8HiQAyifOetRrxNngfzs2KENoq98v7/c4SDUEJDT8damoUxjlBV2LF4a6LzOmU1bX+Cg0B3PUW4BxOtPviW40JfyfphybHoSe3N6551ydTVl4iVJEkd70mJJrEKKovZGVn5cu8byDAv4BjR6Co4mrQ3JcyywZzbDBWQBx5+61tlXLfg+rWhal/jus831m6fO8kYnhZcvKgOhrUAnwCsRpVNGUnSxQO9OczXMsbcnrTCyoN8Xac7MXss9/98= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR12MB5225.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(26005)(15650500001)(316002)(7696005)(33656002)(6506007)(9686003)(55016002)(83380400001)(54906003)(53546011)(110136005)(186003)(71200400001)(8676002)(8936002)(122000001)(4326008)(86362001)(966005)(52536014)(508600001)(38100700002)(45080400002)(66446008)(66556008)(66946007)(66476007)(64756008)(76116006)(5660300002)(2906002)(38070700005);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?u+8YJMgWA3MINsd/CrUoJDf+dKnhr0DnVVTLdr6ZDRcXZL/3jdNCwC5zstna?= =?us-ascii?Q?Z74qglsSTWukpG6EV8OYYCLaB9TXusx4negPCG9rt31ttCSEuAftglIcjwA6?= =?us-ascii?Q?LhRQzWiOO88ZOpeHaBIqoKd3nufm0N8fbDpN8eb0jb9kGfJ5g16pVZ4VApu0?= =?us-ascii?Q?QtS/BtUf5Dw0B7qrG1EAm6TMAV6dhGvunNRuf5Zgw32ukac+1rjX8+ruDpsc?= =?us-ascii?Q?PUwFt0VqhIEcMmuWkwfZAPS5OUiud4osrUwkqXmg3tlP2iBTGKgkTxFyoX5L?= =?us-ascii?Q?0eAU/ebbPcou+jTJpajqNUeGS3zVAe9/N9n+en8D2Go3zONLNMn1lpstKVZg?= =?us-ascii?Q?97zvNEJAW97UsCLjn3Awg+JLdBw4nD0QgjlSIBSElWW9Ni+v/1iP4YeWDNbJ?= =?us-ascii?Q?Ij7pHOwzL3/oehxJ7cLCV9Hv78GGuXMXQ8JxWjDvBSxcKpOFRQInJDb6Q/AG?= =?us-ascii?Q?N8mC7uNV76ihhn0NTrSYjezkR8W5DQplaxXnGnKUqMXawby0a0FPh1FsqJ4f?= =?us-ascii?Q?D6PCpFCx6XrT2Tw7oyFGSrq4N4ngAvKPF+7iSTBkVetK/bS18j9J60uic6Mv?= =?us-ascii?Q?bVdO1kVIhZmOCGY9bhWTgiAvrP6y3Bp61swQbJOCcDGu4I268G34IyQwjKt0?= =?us-ascii?Q?Ysa10FECDbDXcmYWnjP3N+NeNEkwop2+LlHslW5KO3naCQtXIho1ze5fH8dw?= =?us-ascii?Q?01nXId/fvxayAnVdhuRquQHhFcCB8PwKGD+fO2UMFZV53V30RuGUpVSqdqLS?= =?us-ascii?Q?bt7M4J/6oi0lZN2jMpQSSRog5YXsTFsbCJr471LDKIQu+gYU6RWJiV969HCK?= =?us-ascii?Q?mLHEmNTDHNZK3Yt5Pb5eL0a3jZtv5599is5iqeC4KbOKjhpx3iiurlyMwest?= =?us-ascii?Q?4o54t/aay8tAhhW/IvGMcsy8xJZ6wCm+YFbb3WWiHWf1C6wLDGe5BA0UD17i?= =?us-ascii?Q?++MCqKKGRrW3Re2K+/BLIMHiM9g5PjRTkakd8gR2GIbng6RYADSLHKqaEPAg?= =?us-ascii?Q?9lKkLl/ZNiL0jcOCfzhyUiAHtbuvE3vD4QmbY6f+HJFqxHdvhz6/Jo+aoZbt?= =?us-ascii?Q?q3NeamJOowX9vXH20RSESQ/GJAj49hZa77SrZqSOh6AH1c9+o+emQO92VqXq?= =?us-ascii?Q?bfY8yc0KX3K7NV1Sl2upeiQ1Km8swn51xlELYSdGAndayLf/wa4H6o9TfJFm?= =?us-ascii?Q?q+30W+kUBgaYOsS2OVdP/IsO/swmjf1KB3JxB0lVC2+/Jjtuz41JciJAxcj5?= =?us-ascii?Q?gJknauS54dYZhlaCKj8RgMuT2a64Uhf8lFTDK3LoLcpKCQHbTWsuoTK+tbh7?= =?us-ascii?Q?i9wFsW+FMKXXUBi3Fz2NtcOi+cxIe0+HNm7/KTO2bAfwOjnlMQXxbgtI/PHv?= =?us-ascii?Q?eM1UfRXJBTf3k0OeAzWN2N/bmZ+hP7x3F3GFBtbrTsHEJ8QaEoBFiY0RtKb7?= =?us-ascii?Q?nQVJf8ar8WRJ4/2IsPvkhOYZTzLgFqtJ+ObW+Un9cWKmKoElUBwpF9aZR7eD?= =?us-ascii?Q?iIBPlzBHJsHHKQyL7pNbJChottEHWKNqBE4px2KmvaYsfwInerLsZtVPNbXI?= =?us-ascii?Q?fBf854XQVQadZDUORREcp44j8sVixUOvkuYfMGL16jOGxd3fP3KmsQoMz7St?= =?us-ascii?Q?dXXeEKnnW0mzfIsqGPSsSto=3D?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR12MB5225.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e335ed9a-ae43-4d2f-ba03-08d999677aa8 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Oct 2021 16:33:16.6721 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ovYN1VDlpFpPcFHzY1R0Y1cSxu1UW2f48dkjsM667BhOTyFIpKZPGl/BNpp0N5RPf4bfh+qkDsQv9eLXrOUERQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5193 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable [Public] Hi Nate, I tested on real hardware with latest linux(didn't tested with older OSes)= . Note that with X2APIC mode I don't see any issue having APIC NMI structure = and not having NMI structure. In both cases OS boots without any issue. Just thought that why to include = APIC NMI structure in X2APIC mode. Do you want me to resubmit the patch and include the APIC NMI for X2APIC mo= de? Thanks Abdul -----Original Message----- From: Desimone, Nathaniel L =20 Sent: 27 October 2021 13:47 To: devel@edk2.groups.io; Attar, AbdulLateef (Abdul Lateef) Cc: Chiu, Chasel ; Liming Gao ; Dong, Eric Subject: RE: [edk2-devel] [edk2-platforms] [PATCH v1 1/2] MinPlatformPkg: U= pdate APIC Table based on mode [CAUTION: External Email] Hi Abdul, I do agree with you that logically it seems to be the right thing to not in= stall the local APIC NMI structure if we install the X2APIC NMI structure i= nstead. However, I went and took a look at some of our internal closed sour= ce code and it appears that even on X2APIC systems we actually install both= NMI structures. My immediate reaction was to simply consider that a bug, b= ut I am worried that this might have been done to workaround some buggy and= /or legacy OS behavior. I've been trying to find more history on it but tha= t behavior has been in our codebase for a very long time. IMHO it would be = extremely weird for an OS to support X2APIC and have some bug handling X2AP= IC NMI structures... but it is always best to check assumptions. Can you elaborate on any testing that you have done? Have you tested this c= hange on a real HW? If yes, which OS did you try booting? Have you tried an= y older OSes? Thanks, Nate -----Original Message----- From: devel@edk2.groups.io On Behalf Of Abdul Lateef= Attar via groups.io Sent: Friday, October 22, 2021 7:48 AM To: devel@edk2.groups.io Cc: Chiu, Chasel ; Desimone, Nathaniel L ; Liming Gao ; Dong, Eric Subject: [edk2-devel] [edk2-platforms] [PATCH v1 1/2] MinPlatformPkg: Updat= e APIC Table based on mode Detects the APIC mode by calling GetApicMode(). if current platform is in X2APIC mode sets the global mX2ApicEnabled. Also install the APIC NMI structure only if platform is not in X2APIC mode. Cc: Chasel Chiu Cc: Nate DeSimone Cc: Liming Gao Cc: Eric Dong Signed-off-by: Abdul Lateef Attar --- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 35 ++++++++= ++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b= /Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index f5c4f2c3f1a9..032903029a95 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -3,6 +3,7 @@ Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
Copyright (c) Microsoft Corporation.
+Copyright (c) 2021, AMD Incorporated. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -947,21 +948,23 @@ InstallMadtFromScratch ( // // Build Local APIC NMI Structures // - LocalApciNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_APIC_NMI; - LocalApciNmiStruct.Length =3D sizeof (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCT= URE); - LocalApciNmiStruct.AcpiProcessorUid =3D 0xFF; // Applies to all pro= cessors - LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tigge= red, Active High - LocalApciNmiStruct.LocalApicLint =3D 0x1; + if (!mX2ApicEnabled) { + LocalApciNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_APIC_NMI; + LocalApciNmiStruct.Length =3D sizeof + (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE); + LocalApciNmiStruct.AcpiProcessorUid =3D 0xFF; // Applies to all p= rocessors + LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tig= gered, Active High + LocalApciNmiStruct.LocalApicLint =3D 0x1; - ASSERT (MadtStructsIndex < MaxMadtStructCount); - Status =3D CopyStructure ( - &MadtTableHeader.Header, - (STRUCTURE_HEADER *) &LocalApciNmiStruct, - &MadtStructs[MadtStructsIndex++] - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "CopyMadtStructure (APIC NMI) failed: %r\n", Stat= us)); - goto Done; + ASSERT (MadtStructsIndex < MaxMadtStructCount); + Status =3D CopyStructure ( + &MadtTableHeader.Header, + (STRUCTURE_HEADER *) &LocalApciNmiStruct, + &MadtStructs[MadtStructsIndex++] + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (APIC NMI) failed: %r\n",=20 + Status)); + goto Done; + } } // @@ -1454,6 +1457,10 @@ InstallAcpiPlatform ( DEBUG ((DEBUG_INFO, "mNumberOfCpus - %d\n", mNumberOfCpus)); DEBUG ((DEBUG_INFO, "mNumberOfEnabledCPUs - %d\n", mNumberOfEnabledCPUs)= ); + if (LOCAL_APIC_MODE_X2APIC =3D=3D GetApicMode ()) { + mX2ApicEnabled =3D TRUE; + } + DEBUG ((DEBUG_INFO, "mX2ApicEnabled - 0x%x\n", mX2ApicEnabled)); DEBUG ((DEBUG_INFO, "mForceX2ApicId - 0x%x\n", mForceX2ApicId)); -- 2.25.1