From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: michael.a.kubacki@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Wed, 04 Sep 2019 00:26:41 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Sep 2019 00:26:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,465,1559545200"; d="scan'208";a="334116827" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by orsmga004.jf.intel.com with ESMTP; 04 Sep 2019 00:26:41 -0700 Received: from orsmsx116.amr.corp.intel.com (10.22.240.14) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 4 Sep 2019 00:26:40 -0700 Received: from orsmsx121.amr.corp.intel.com ([169.254.10.57]) by ORSMSX116.amr.corp.intel.com ([169.254.7.63]) with mapi id 14.03.0439.000; Wed, 4 Sep 2019 00:26:40 -0700 From: "Kubacki, Michael A" To: "devel@edk2.groups.io" , "Sinha, Ankit" CC: "Chiu, Chasel" , "Desimone, Nathaniel L" , "Gao, Liming" Subject: Re: [edk2-devel] [edk2-platforms] [PATCH v2 1/1] MinPlatformPkg/Acpi: MADT NMI default flag set to Edge-Triggered Thread-Topic: [edk2-devel] [edk2-platforms] [PATCH v2 1/1] MinPlatformPkg/Acpi: MADT NMI default flag set to Edge-Triggered Thread-Index: AQHVX4I2BhVyHb2BEkaX/zFzd+RmF6cbJHgA Date: Wed, 4 Sep 2019 07:26:40 +0000 Message-ID: <49AB4ACB9627B8468F29D589A27B745588AA04F8@ORSMSX121.amr.corp.intel.com> References: <20190830222808.20308-1-ankit.sinha@intel.com> In-Reply-To: <20190830222808.20308-1-ankit.sinha@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjc0ZTFiZDgtYTA2YS00MGNhLTg3ZTktZGU0MjJkMTMyZmJkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNWJENmFWTGpOYk1yZlY4Vis3WWZUT3liWlRVMFNLQ1R3ZTZ0SEtRUjlyc3BaSnpGZlh5QTNVQmcyOFVXSkU3diJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Return-Path: michael.a.kubacki@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch is not applying cleanly for me. Can you please check it against = the current master branch? error: patch failed: Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPla= tform.c:1329 error: Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c: patch= does not apply error: patch failed: Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPla= tform.c:1329 Applying patch Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.= c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Hunk #3 applied cleanly. Hunk #4 applied cleanly. Rejected hunk #5. Hunk #6 applied cleanly. > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Sinha, An= kit > Sent: Friday, August 30, 2019 3:28 PM > To: devel@edk2.groups.io > Cc: Kubacki, Michael A ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Gao, Liming > Subject: [edk2-devel] [edk2-platforms] [PATCH v2 1/1] MinPlatformPkg/Acp= i: > MADT NMI default flag set to Edge-Triggered >=20 > 1. Default APIC NMI structure in MADT changed to expose > Level-Triggered interrupts. > 2. x2APIC NMI structure won't be exposed to OS if x2APIC is not enabled. >=20 > Cc: Michael Kubacki > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao >=20 > Signed-off-by: Ankit Sinha > --- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 54 > ++++++++++---------- > 1 file changed, 28 insertions(+), 26 deletions(-) >=20 > diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.= c > b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > index 5eb727929bfb..1b251ca2962d 100644 > --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > @@ -1,7 +1,7 @@ > /** @file > ACPI Platform Driver >=20 > -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -1049,7 +1049,7 @@ InstallMadtFromScratch ( > LocalApciNmiStruct.Type =3D EFI_ACPI_4_0_LOCAL_APIC_NMI; > LocalApciNmiStruct.Length =3D sizeof > (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE); > LocalApciNmiStruct.AcpiProcessorId =3D 0xFF; // Applies to all p= rocessors > - LocalApciNmiStruct.Flags =3D 0x000D; // Flags - Level-ti= ggered, Active > High > + LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tig= gered, Active > High > LocalApciNmiStruct.LocalApicLint =3D 0x1; >=20 > ASSERT (MadtStructsIndex < MaxMadtStructCount); @@ -1066,24 +1066,26 > @@ InstallMadtFromScratch ( > // > // Build Local x2APIC NMI Structure > // > - LocalX2ApicNmiStruct.Type =3D EFI_ACPI_4_0_LOCAL_X2APIC_NMI; > - LocalX2ApicNmiStruct.Length =3D sizeof > (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE); > - LocalX2ApicNmiStruct.Flags =3D 0x000D; // Flags - Lev= el-tiggered, > Active High > - LocalX2ApicNmiStruct.AcpiProcessorUid =3D 0xFFFFFFFF; // Applies to = all > processors > - LocalX2ApicNmiStruct.LocalX2ApicLint =3D 0x01; > - LocalX2ApicNmiStruct.Reserved[0] =3D 0x00; > - LocalX2ApicNmiStruct.Reserved[1] =3D 0x00; > - LocalX2ApicNmiStruct.Reserved[2] =3D 0x00; > + if (mX2ApicEnabled) { > + LocalX2ApicNmiStruct.Type =3D EFI_ACPI_4_0_LOCAL_X2APIC_NMI; > + LocalX2ApicNmiStruct.Length =3D sizeof > (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE); > + LocalX2ApicNmiStruct.Flags =3D 0x000D; // Flags - L= evel-tiggered, > Active High > + LocalX2ApicNmiStruct.AcpiProcessorUid =3D 0xFFFFFFFF; // Applies t= o all > processors > + LocalX2ApicNmiStruct.LocalX2ApicLint =3D 0x01; > + LocalX2ApicNmiStruct.Reserved[0] =3D 0x00; > + LocalX2ApicNmiStruct.Reserved[1] =3D 0x00; > + LocalX2ApicNmiStruct.Reserved[2] =3D 0x00; >=20 > - ASSERT (MadtStructsIndex < MaxMadtStructCount); > - Status =3D CopyStructure ( > - &MadtTableHeader.Header, > - (STRUCTURE_HEADER *) &LocalX2ApicNmiStruct, > - &MadtStructs[MadtStructsIndex++] > - ); > - if (EFI_ERROR (Status)) { > - DEBUG ((EFI_D_ERROR, "CopyMadtStructure (x2APIC NMI) failed: %r\n", > Status)); > - goto Done; > + ASSERT (MadtStructsIndex < MaxMadtStructCount); > + Status =3D CopyStructure ( > + &MadtTableHeader.Header, > + (STRUCTURE_HEADER *) &LocalX2ApicNmiStruct, > + &MadtStructs[MadtStructsIndex++] > + ); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "CopyMadtStructure (x2APIC NMI) failed: %r\n= ", > Status)); > + goto Done; > + } > } >=20 > // > @@ -1167,7 +1169,7 @@ InstallMcfgFromScratch ( > // > // Set MCFG table "Length" field based on the number of PCIe segments > enumerated so far > // > - McfgTable->Header.Length =3D (UINT32)(sizeof > (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEAD > ER) + > + McfgTable->Header.Length =3D (UINT32)(sizeof > + > (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEAD > ER) + > sizeof > (EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_AD > DRESS_ALLOCATION_STRUCTURE) * SegmentCount); >=20 > Segment =3D (VOID *)(McfgTable + 1); > @@ -1329,11 +1331,11 @@ PlatformUpdateTables ( > HpetCapabilities.Uint64 =3D HpetCapabilitiesData; > HpetCapabilitiesData =3D MmioRead32 (HpetBaseAddress + > HPET_GENERAL_CAPABILITIES_ID_OFFSET + 4); > HpetCapabilities.Uint64 |=3D LShiftU64 (HpetCapabilitiesData, 32); > - HpetBlockId.Bits.Revision =3D HpetCapabilities.Bits.Revision; > - HpetBlockId.Bits.NumberOfTimers =3D HpetCapabilities.Bits.NumberOfT= imers; > - HpetBlockId.Bits.CounterSize =3D HpetCapabilities.Bits.CounterSi= ze; > - HpetBlockId.Bits.Reserved =3D 0; > - HpetBlockId.Bits.LegacyRoute =3D HpetCapabilities.Bits.LegacyRou= te; > + HpetBlockId.Bits.Revision =3D HpetCapabilities.Bits.Revision; > + HpetBlockId.Bits.NumberOfTimers =3D HpetCapabilities.Bits.NumberOfT= imers; > + HpetBlockId.Bits.CounterSize =3D HpetCapabilities.Bits.CounterSi= ze; > + HpetBlockId.Bits.Reserved =3D 0; > + HpetBlockId.Bits.LegacyRoute =3D HpetCapabilities.Bits.LegacyRou= te; > HpetBlockId.Bits.VendorId =3D HpetCapabilities.Bits.VendorId; > HpetTable->EventTimerBlockId =3D HpetBlockId.Uint32; > HpetTable->MainCounterMinimumClockTickInPeriodicMode =3D > (UINT16)HpetCapabilities.Bits.CounterClockPeriod; > @@ -1459,7 +1461,7 @@ UpdateLocalTable ( >=20 > for (Index =3D 0; Index < sizeof(mLocalTable)/sizeof(mLocalTable[0]);= Index++) { > CurrentTable =3D mLocalTable[Index]; > - > + > PlatformUpdateTables (CurrentTable, &Version); >=20 > TableHandle =3D 0; > -- > 2.16.2.windows.1 >=20 >=20 >=20