From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 3529021AEB0C4 for ; Tue, 25 Jul 2017 19:47:43 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2017 19:49:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,413,1496127600"; d="scan'208";a="129514936" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga005.jf.intel.com with ESMTP; 25 Jul 2017 19:49:44 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 25 Jul 2017 19:49:44 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 25 Jul 2017 19:49:44 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.146]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0319.002; Wed, 26 Jul 2017 10:49:42 +0800 From: "Yao, Jiewen" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Gao, Liming" Thread-Topic: [PATCH 2/3] MdePkg: Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table Thread-Index: AQHTAV/k4zcX1cPQ40CIiFkm77rP46JlcOUQ Date: Wed, 26 Jul 2017 02:49:42 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503A97F13C@shsmsx102.ccr.corp.intel.com> References: <1500558932-298208-1-git-send-email-star.zeng@intel.com> <1500558932-298208-3-git-send-email-star.zeng@intel.com> In-Reply-To: <1500558932-298208-3-git-send-email-star.zeng@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 2/3] MdePkg: Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2017 02:47:43 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen.yao@intel.com > -----Original Message----- > From: Zeng, Star > Sent: Thursday, July 20, 2017 9:56 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Yao, Jiewen ;= Gao, > Liming > Subject: [PATCH 2/3] MdePkg: Follow UEFI 2.7 spec to deprecate SMM > Communication ACPI Table >=20 > Delete PiSmmCommunicationAcpiTable.h and delete SMM Communication ACPI > Table definition in UefiAcpiDataTable.h. > As EFI_SMM_COMMUNICATE_HEADER is defined in both PI spec vol 4 > and UEFI spec, move its definition to SmmCommunication.h. >=20 > Cc: Jiewen Yao > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Star Zeng > --- > MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h | 20 --------------- > MdePkg/Include/PiSmm.h | 3 +-- > MdePkg/Include/Protocol/SmmCommunication.h | 28 > +++++++++++++++++---- > MdePkg/Include/Uefi/UefiAcpiDataTable.h | 33 +------------------= ------ > 4 files changed, 25 insertions(+), 59 deletions(-) > delete mode 100644 MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h >=20 > diff --git a/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h > b/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h > deleted file mode 100644 > index 979aa9b316ec..000000000000 > --- a/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h > +++ /dev/null > @@ -1,20 +0,0 @@ > -/** @file > - PI SMM Communication ACPI Table Definition. > - > -Copyright (c) 2011, Intel Corporation. All rights reserved.
> -This program and the accompanying materials are licensed and made availa= ble > under > -the terms and conditions of the BSD License that accompanies this distri= bution. > -The full text of the license may be found at > -http://opensource.org/licenses/bsd-license.php. > - > -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > - > -**/ > - > -#ifndef __PI_SMM_COMMUNICATION_ACPI_TABLE__ > -#define __PI_SMM_COMMUNICATION_ACPI_TABLE__ > - > -#include > - > -#endif > diff --git a/MdePkg/Include/PiSmm.h b/MdePkg/Include/PiSmm.h > index 535080037b8d..e94a5d21b8bf 100644 > --- a/MdePkg/Include/PiSmm.h > +++ b/MdePkg/Include/PiSmm.h > @@ -2,7 +2,7 @@ >=20 > Root include file for Mde Package SMM modules. >=20 > -Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> +Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
> This program and the accompanying materials are licensed and made availa= ble > under > the terms and conditions of the BSD License that accompanies this distri= bution. > The full text of the license may be found at > @@ -20,7 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > EITHER EXPRESS OR IMPLIED. > #include >=20 > #include > -#include >=20 > #endif >=20 > diff --git a/MdePkg/Include/Protocol/SmmCommunication.h > b/MdePkg/Include/Protocol/SmmCommunication.h > index c284e55b24a8..5587d49ceda3 100644 > --- a/MdePkg/Include/Protocol/SmmCommunication.h > +++ b/MdePkg/Include/Protocol/SmmCommunication.h > @@ -4,7 +4,7 @@ > This protocol provides a means of communicating between drivers outsid= e of > SMM and SMI > handlers inside of SMM. >=20 > - Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the = BSD > License > which accompanies this distribution. The full text of the license may= be > found at > @@ -18,10 +18,28 @@ > #ifndef _SMM_COMMUNICATION_H_ > #define _SMM_COMMUNICATION_H_ >=20 > -// > -// Need include this header file for EFI_SMM_COMMUNICATE_HEADER data > structure. > -// > -#include > +#pragma pack(1) > + > +/// > +/// To avoid confusion in interpreting frames, the communication buffer = should > always > +/// begin with EFI_SMM_COMMUNICATE_HEADER > +/// > +typedef struct { > + /// > + /// Allows for disambiguation of the message format. > + /// > + EFI_GUID HeaderGuid; > + /// > + /// Describes the size of Data (in bytes) and does not include the siz= e of the > header. > + /// > + UINTN MessageLength; > + /// > + /// Designates an array of bytes that is MessageLength in size. > + /// > + UINT8 Data[1]; > +} EFI_SMM_COMMUNICATE_HEADER; > + > +#pragma pack() >=20 > #define EFI_SMM_COMMUNICATION_PROTOCOL_GUID \ > { \ > diff --git a/MdePkg/Include/Uefi/UefiAcpiDataTable.h > b/MdePkg/Include/Uefi/UefiAcpiDataTable.h > index 957721fa7cec..ae4942b69b47 100644 > --- a/MdePkg/Include/Uefi/UefiAcpiDataTable.h > +++ b/MdePkg/Include/Uefi/UefiAcpiDataTable.h > @@ -1,7 +1,7 @@ > /** @file > UEFI ACPI Data Table Definition. >=20 > -Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
> +Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
> This program and the accompanying materials are licensed and made availa= ble > under > the terms and conditions of the BSD License that accompanies this distri= bution. > The full text of the license may be found at > @@ -23,37 +23,6 @@ typedef struct { > GUID Identifier; > UINT16 DataOffset; > } EFI_ACPI_DATA_TABLE; > - > -typedef struct { > - EFI_ACPI_DATA_TABLE UefiAcpiDataTable; > - UINT32 SwSmiNumber; > - UINT64 BufferPtrAddress; > -} EFI_SMM_COMMUNICATION_ACPI_TABLE; > - > -typedef struct { > - EFI_SMM_COMMUNICATION_ACPI_TABLE > UefiSmmCommunicationAcpiTable; > - EFI_ACPI_6_0_GENERIC_ADDRESS_STRUCTURE InvocationRegister; > -} EFI_SMM_COMMUNICATION_ACPI_TABLE_2; > - > -/// > -/// To avoid confusion in interpreting frames, the communication buffer = should > always > -/// begin with EFI_SMM_COMMUNICATE_HEADER > -/// > -typedef struct { > - /// > - /// Allows for disambiguation of the message format. > - /// > - EFI_GUID HeaderGuid; > - /// > - /// Describes the size of Data (in bytes) and does not include the siz= e of the > header. > - /// > - UINTN MessageLength; > - /// > - /// Designates an array of bytes that is MessageLength in size. > - /// > - UINT8 Data[1]; > -} EFI_SMM_COMMUNICATE_HEADER; > - > #pragma pack() >=20 > #endif > -- > 2.7.0.windows.1