From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id A0D6321BB253A for ; Mon, 12 Jun 2017 12:36:47 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 57A0C344; Mon, 12 Jun 2017 12:38:01 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4B6F33F581; Mon, 12 Jun 2017 12:38:00 -0700 (PDT) From: Supreeth Venkatesh To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, michael.d.kinney@intel.com, liming.gao@intel.com, achin.gupta@arm.com, supreeth.venkatesh@arm.com Date: Mon, 12 Jun 2017 20:37:32 +0100 Message-Id: <1497296252-46672-3-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497296252-46672-1-git-send-email-supreeth.venkatesh@arm.com> References: <1497296252-46672-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [PATCH 2/2] MdePkg: Maintain backwards compatibility between MM/SMM. 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: Mon, 12 Jun 2017 19:36:47 -0000 PI v1.5 Volume 4 replaces EFI_SMM_COMMUNICATION_PROTOCOL with EFI_MM_COMMUNICATION_PROTOCOL. Hence, modify the SMM Communication protocol header file to include the EFI_MM_COMMUNICATION_PROTOCOL header. Also, PI v1.5 Volume 4 replaces the data structure EFI_SMM_COMMUNICATE_HEADER with EFI_MM_COMMUNICATE_HEADER. Hence, modify UefiAcpiDataTable header file to maintain backwards compatibility. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Supreeth Venkatesh --- MdePkg/Include/Protocol/SmmCommunication.h | 52 +++++++----------------------- MdePkg/Include/Uefi/UefiAcpiDataTable.h | 4 ++- 2 files changed, 15 insertions(+), 41 deletions(-) diff --git a/MdePkg/Include/Protocol/SmmCommunication.h b/MdePkg/Include/Protocol/SmmCommunication.h index c284e55..8edebc2 100644 --- a/MdePkg/Include/Protocol/SmmCommunication.h +++ b/MdePkg/Include/Protocol/SmmCommunication.h @@ -5,10 +5,12 @@ handlers inside of SMM. Copyright (c) 2009 - 2011, 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 - http://opensource.org/licenses/bsd-license.php + Copyright (c) 2016 - 2017, ARM Limited. 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 + 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. @@ -19,45 +21,15 @@ #define _SMM_COMMUNICATION_H_ // -// Need include this header file for EFI_SMM_COMMUNICATE_HEADER data structure. +// Include the EFI_MM_COMMUNICATION_PROTOCOL header for actual definitions. This +// header is used to maintain backwards compatibility. // -#include - -#define EFI_SMM_COMMUNICATION_PROTOCOL_GUID \ - { \ - 0xc68ed8e2, 0x9dc6, 0x4cbd, { 0x9d, 0x94, 0xdb, 0x65, 0xac, 0xc5, 0xc3, 0x32 } \ - } - -typedef struct _EFI_SMM_COMMUNICATION_PROTOCOL EFI_SMM_COMMUNICATION_PROTOCOL; +#include -/** - Communicates with a registered handler. - - This function provides a service to send and receive messages from a registered UEFI service. - - @param[in] This The EFI_SMM_COMMUNICATION_PROTOCOL instance. - @param[in] CommBuffer A pointer to the buffer to convey into SMRAM. - @param[in] CommSize The size of the data buffer being passed in.On exit, the size of data - being returned. Zero if the handler does not wish to reply with any data. - - @retval EFI_SUCCESS The message was successfully posted. - @retval EFI_INVALID_PARAMETER The CommBuffer was NULL. -**/ -typedef -EFI_STATUS -(EFIAPI *EFI_SMM_COMMUNICATE2)( - IN CONST EFI_SMM_COMMUNICATION_PROTOCOL *This, - IN OUT VOID *CommBuffer, - IN OUT UINTN *CommSize - ); +#define EFI_SMM_COMMUNICATION_PROTOCOL_GUID EFI_MM_COMMUNICATION_PROTOCOL_GUID -/// -/// EFI SMM Communication Protocol provides runtime services for communicating -/// between DXE drivers and a registered SMI handler. -/// -struct _EFI_SMM_COMMUNICATION_PROTOCOL { - EFI_SMM_COMMUNICATE2 Communicate; -}; +typedef EFI_MM_COMMUNICATION_PROTOCOL EFI_SMM_COMMUNICATION_PROTOCOL; +typedef EFI_MM_COMMUNICATE EFI_SMM_COMMUNICATE2; extern EFI_GUID gEfiSmmCommunicationProtocolGuid; diff --git a/MdePkg/Include/Uefi/UefiAcpiDataTable.h b/MdePkg/Include/Uefi/UefiAcpiDataTable.h index 957721f..f0043a3 100644 --- a/MdePkg/Include/Uefi/UefiAcpiDataTable.h +++ b/MdePkg/Include/Uefi/UefiAcpiDataTable.h @@ -52,7 +52,9 @@ typedef struct { /// Designates an array of bytes that is MessageLength in size. /// UINT8 Data[1]; -} EFI_SMM_COMMUNICATE_HEADER; +} EFI_MM_COMMUNICATE_HEADER; + +typedef EFI_MM_COMMUNICATE_HEADER EFI_SMM_COMMUNICATE_HEADER; #pragma pack() -- 2.7.4