From nobody Fri Dec 27 21:37:30 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1500558948372267.3086353192766; Thu, 20 Jul 2017 06:55:48 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5087221CE7460; Thu, 20 Jul 2017 06:53:45 -0700 (PDT) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 9FC1E21D147D8 for ; Thu, 20 Jul 2017 06:53:43 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jul 2017 06:55:39 -0700 Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.12]) by orsmga001.jf.intel.com with ESMTP; 20 Jul 2017 06:55:38 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,384,1496127600"; d="scan'208";a="1153475452" From: Star Zeng To: edk2-devel@lists.01.org Date: Thu, 20 Jul 2017 21:55:31 +0800 Message-Id: <1500558932-298208-3-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1500558932-298208-1-git-send-email-star.zeng@intel.com> References: <1500558932-298208-1-git-send-email-star.zeng@intel.com> Subject: [edk2] [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: , Cc: Jiewen Yao , Liming Gao , Star Zeng MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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. Cc: Jiewen Yao Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Jiewen.yao@intel.com --- 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 diff --git a/MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h b/MdePkg/Inclu= de/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 availabl= e under=20 -the terms and conditions of the BSD License that accompanies this distribu= tion. =20 -The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php. = =20 - =20 -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, = =20 -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI= ED. - -**/ - -#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 availabl= e under=20 the terms and conditions of the BSD License that accompanies this distribu= tion. =20 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/Pr= otocol/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 outside = of SMM and SMI=20 handlers inside of SMM. =20 =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 =20 are licensed and made available under the terms and conditions of the BS= D License =20 which accompanies this distribution. The full text of the license may b= e found at =20 @@ -18,10 +18,28 @@ #ifndef _SMM_COMMUNICATION_H_ #define _SMM_COMMUNICATION_H_ =20 -// -// Need include this header file for EFI_SMM_COMMUNICATE_HEADER data struc= ture. -// -#include +#pragma pack(1) + +/// +/// To avoid confusion in interpreting frames, the communication buffer sh= ould always=20 +/// 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 size = 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 availabl= e under=20 the terms and conditions of the BSD License that accompanies this distribu= tion. =20 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 sh= ould always=20 -/// 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 size = 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 --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel