[PATCH 0/3] Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table

[PATCH 0/3] Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table

[Star Zeng]

Delete SMM Communication ACPI Table definition and update
PiSmmCommunicationSmm to not install SMM Communication ACPI
Table anymore.

Star Zeng (3):
  SecurityPkg OpalPasswordSupportLib: Remove include to
    UefiAcpiDataTable.h
  MdePkg: Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table
  UefiCpuPkg PiSmmCommunicationSmm: Deprecate SMM Communication ACPI
    Table

 MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h    | 20 --------
 MdePkg/Include/PiSmm.h                             |  3 +-
 MdePkg/Include/Protocol/SmmCommunication.h         | 28 ++++++++--
 MdePkg/Include/Uefi/UefiAcpiDataTable.h            | 33 +-----------
 .../OpalPasswordSupportNotify.h                    |  3 +-
 .../PiSmmCommunication/PiSmmCommunicationSmm.c     | 60 +---------------------
 .../PiSmmCommunication/PiSmmCommunicationSmm.inf   | 29 ++---------
 .../PiSmmCommunication/PiSmmCommunicationSmm.uni   | 14 ++---
 .../PiSmmCommunicationSmmExtra.uni                 |  4 +-
 9 files changed, 39 insertions(+), 155 deletions(-)
 delete mode 100644 MdePkg/Include/Pi/PiSmmCommunicationAcpiTable.h

-- 
2.7.0.windows.1

[PATCH 1/3] SecurityPkg OpalPasswordSupportLib: Remove include to UefiAcpiDataTable.h

[Star Zeng]

Remove redundant include to UefiAcpiDataTable.h as
SmmCommunication.h will help to include it.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <dong.eric@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h b/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
index f0ad3a113612..a2115b738653 100644
--- a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
+++ b/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
@@ -1,7 +1,7 @@
 /** @file
   Implementation of Opal password support library.
 
-Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
 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,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiDxe.h>
 #include <PiSmm.h>
 
-#include <Uefi/UefiAcpiDataTable.h>
 #include <Guid/PiSmmCommunicationRegionTable.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
-- 
2.7.0.windows.1

[PATCH 2/3] MdePkg: Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table

[Star Zeng]

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 <jiewen.yao@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@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/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.<BR>
-This program and the accompanying materials are licensed and made available under 
-the terms and conditions of the BSD License that 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.
-
-**/
-
-#ifndef __PI_SMM_COMMUNICATION_ACPI_TABLE__
-#define __PI_SMM_COMMUNICATION_ACPI_TABLE__
-
-#include <Uefi/UefiAcpiDataTable.h>
-
-#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 @@
 
   Root include file for Mde Package SMM modules.
 
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under 
 the terms and conditions of the BSD License that accompanies this distribution.  
 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 <Uefi/UefiSpec.h>
 
 #include <Pi/PiSmmCis.h>
-#include <Pi/PiSmmCommunicationAcpiTable.h>
 
 #endif
 
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 outside of SMM and SMI 
   handlers inside of SMM.  
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
   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_
 
-//
-// Need include this header file for EFI_SMM_COMMUNICATE_HEADER data structure.
-//
-#include <Uefi/UefiAcpiDataTable.h>
+#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 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()
 
 #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.
 
-Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials are licensed and made available under 
 the terms and conditions of the BSD License that accompanies this distribution.  
 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 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()
 
 #endif
-- 
2.7.0.windows.1

[PATCH 3/3] UefiCpuPkg PiSmmCommunicationSmm: Deprecate SMM Communication ACPI Table

[Star Zeng]

Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table,
PiSmmCommunicationSmm will not install SMM Communication ACPI Table
anymore.

Cc: Jiewen Yao <jienwen.yao@intel.com>
Cc: Jeff Fan <jeff.fan@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 .../PiSmmCommunication/PiSmmCommunicationSmm.c     | 60 +---------------------
 .../PiSmmCommunication/PiSmmCommunicationSmm.inf   | 29 ++---------
 .../PiSmmCommunication/PiSmmCommunicationSmm.uni   | 14 ++---
 .../PiSmmCommunicationSmmExtra.uni                 |  4 +-
 4 files changed, 13 insertions(+), 94 deletions(-)

diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
index 077eacce88d1..2b395f38da64 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
+++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
@@ -1,7 +1,7 @@
 /** @file
 PiSmmCommunication SMM Driver.
 
-Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
 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
@@ -19,16 +19,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/SmmServicesTableLib.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/HobLib.h>
 #include <Library/DebugLib.h>
 #include <Library/SmmMemLib.h>
-#include <Library/PcdLib.h>
 #include <Protocol/SmmSwDispatch2.h>
-#include <Protocol/SmmReadyToLock.h>
 #include <Protocol/SmmCommunication.h>
-#include <Protocol/AcpiTable.h>
 #include <Ppi/SmmCommunication.h>
-#include <Guid/Acpi.h>
 
 #include "PiSmmCommunicationPrivate.h"
 
@@ -36,26 +31,6 @@ EFI_SMM_COMMUNICATION_CONTEXT  mSmmCommunicationContext = {
   SMM_COMMUNICATION_SIGNATURE
 };
 
-EFI_SMM_COMMUNICATION_ACPI_TABLE  mSmmCommunicationAcpiTable = {
-  {
-    {
-      EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE,
-      sizeof (EFI_SMM_COMMUNICATION_ACPI_TABLE),
-      0x1,   // Revision
-      0x0,   // Checksum
-      {0x0}, // OemId[6]
-      0x0,   // OemTableId
-      0x0,   // OemRevision
-      0x0,   // CreatorId
-      0x0    // CreatorRevision
-    },
-    {0x0},                                                      // Identifier
-    OFFSET_OF (EFI_SMM_COMMUNICATION_ACPI_TABLE, SwSmiNumber)   // DataOffset
-  },
-  0x0,                                                   // SwSmiNumber
-  0x0                                                    // BufferPtrAddress
-};
-
 /**
   Set SMM communication context.
 **/
@@ -200,22 +175,8 @@ PiSmmCommunicationSmmEntryPoint (
   EFI_SMM_SW_DISPATCH2_PROTOCOL *SmmSwDispatch2;
   EFI_SMM_SW_REGISTER_CONTEXT   SmmSwDispatchContext;
   EFI_HANDLE                    DispatchHandle;
-  EFI_ACPI_TABLE_PROTOCOL       *AcpiTableProtocol;
-  UINTN                         TableKey;
-  UINT64                        OemTableId;
   EFI_PHYSICAL_ADDRESS          *BufferPtrAddress;
 
-  CopyMem (
-    mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemId,
-    PcdGetPtr (PcdAcpiDefaultOemId),
-    sizeof (mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemId)
-    );
-  OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
-  CopyMem (&mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemTableId, &OemTableId, sizeof (UINT64));
-  mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemRevision      = PcdGet32 (PcdAcpiDefaultOemRevision);
-  mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.CreatorId        = PcdGet32 (PcdAcpiDefaultCreatorId);
-  mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.CreatorRevision  = PcdGet32 (PcdAcpiDefaultCreatorRevision);
-
   //
   // Register software SMI handler
   //
@@ -237,32 +198,15 @@ PiSmmCommunicationSmmEntryPoint (
 
   DEBUG ((EFI_D_INFO, "SmmCommunication SwSmi: %x\n", (UINTN)SmmSwDispatchContext.SwSmiInputValue));
 
-  //
-  // Set ACPI table
-  //
-  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &AcpiTableProtocol);
-  ASSERT_EFI_ERROR (Status);
-
-  mSmmCommunicationAcpiTable.SwSmiNumber = (UINT32)SmmSwDispatchContext.SwSmiInputValue;
   BufferPtrAddress = AllocateAcpiNvsMemoryBelow4G (sizeof(EFI_PHYSICAL_ADDRESS));
   ASSERT (BufferPtrAddress != NULL);
   DEBUG ((EFI_D_INFO, "SmmCommunication BufferPtrAddress: 0x%016lx, BufferPtr: 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress, *BufferPtrAddress));
-  mSmmCommunicationAcpiTable.BufferPtrAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress;
-  CopyMem (&mSmmCommunicationAcpiTable.UefiAcpiDataTable.Identifier, &gEfiSmmCommunicationProtocolGuid, sizeof(gEfiSmmCommunicationProtocolGuid));
-
-  Status = AcpiTableProtocol->InstallAcpiTable (
-                                AcpiTableProtocol,
-                                &mSmmCommunicationAcpiTable,
-                                sizeof(mSmmCommunicationAcpiTable),
-                                &TableKey
-                                );
-  ASSERT_EFI_ERROR (Status);
 
   //
   // Save context
   //
   mSmmCommunicationContext.SwSmiNumber = (UINT32)SmmSwDispatchContext.SwSmiInputValue;
-  mSmmCommunicationContext.BufferPtrAddress = mSmmCommunicationAcpiTable.BufferPtrAddress;
+  mSmmCommunicationContext.BufferPtrAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress;
   SetCommunicationContext ();
 
   return Status;
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
index 9b03837cf3f1..67799e9436cd 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
+++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
@@ -1,12 +1,8 @@
 ## @file
-# PI SMM Communication SMM driver that installs the SMM Communication ACPI Table.
+# PI SMM Communication SMM driver that saves SMM communication context
+# for use by SMM Communication PEIM in the S3 boot mode.
 #
-# This SMM driver installs the SMM Communication ACPI Table defined in the UEFI spec
-# which provides a mechanism that can be used in the OS present environment by
-# non-firmware agents for inter-mode communication with SMM agents. It also saves
-# SMM communication context for use by SMM Communication PEIM in the S3 boot mode.
-#
-# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
@@ -49,34 +45,17 @@ [LibraryClasses]
   SmmServicesTableLib
   BaseLib
   BaseMemoryLib
-  HobLib
   DebugLib
   SmmMemLib
-  PcdLib
-
-[Guids]
-  gEfiAcpi20TableGuid                ## SOMETIMES_CONSUMES  ## SystemTable
-  gEfiAcpi10TableGuid                ## SOMETIMES_CONSUMES  ## SystemTable
-  gEfiAcpiTableGuid                  ## SOMETIMES_CONSUMES  ## SystemTable
 
 [Ppis]
   gEfiPeiSmmCommunicationPpiGuid     ## UNDEFINED # SMM Configuration Table
 
 [Protocols]
   gEfiSmmSwDispatch2ProtocolGuid     ## CONSUMES
-  gEfiSmmCommunicationProtocolGuid   ## UNDEFINED # SMM Communication ACPI Table GUID
-  gEfiAcpiTableProtocolGuid          ## CONSUMES
-
-[Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId             ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId        ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision       ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId         ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision   ## CONSUMES
 
 [Depex]
-  gEfiSmmSwDispatch2ProtocolGuid AND
-  gEfiAcpiTableProtocolGuid
+  gEfiSmmSwDispatch2ProtocolGuid
 
 [UserExtensions.TianoCore."ExtraFiles"]
   PiSmmCommunicationSmmExtra.uni
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
index 55df3905df08..9995b4ec7d9d 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
+++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
@@ -1,12 +1,8 @@
 // /** @file
-// PI SMM Communication SMM driver that installs the SMM Communication ACPI Table.
+// PI SMM Communication SMM driver that saves SMM communication context
+// for use by SMM Communication PEIM in the S3 boot mode.
 //
-// This SMM driver installs the SMM Communication ACPI Table defined in the UEFI spec
-// which provides a mechanism that can be used in the OS present environment by
-// non-firmware agents for inter-mode communication with SMM agents. It also saves
-// SMM communication context for use by SMM Communication PEIM in the S3 boot mode.
-//
-// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
 //
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
@@ -18,6 +14,6 @@
 //
 // **/
 
-#string STR_MODULE_ABSTRACT             #language en-US "PI SMM Communication SMM driver that installs the SMM Communication ACPI Table"
+#string STR_MODULE_ABSTRACT             #language en-US "PI SMM Communication SMM driver that saves SMM communication context"
 
-#string STR_MODULE_DESCRIPTION          #language en-US "This SMM driver installs the SMM Communication ACPI Table defined in the UEFI Specification, which provides a mechanism that can be used in the OS-present environment by non-firmware agents for inter-mode communication with SMM agents. It also saves an SMM communication context for use by SMM Communication PEIM in the S3 boot mode."
+#string STR_MODULE_DESCRIPTION          #language en-US "PI SMM Communication SMM driver that saves SMM communication context for use by SMM Communication PEIM in the S3 boot mode."
diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
index 34e7731fb5ae..bb7ce62dc589 100644
--- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
+++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
@@ -1,7 +1,7 @@
 // /** @file
 // PiSmmCommunicationSmm Localized Strings and Content
 //
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
 //
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
@@ -15,4 +15,4 @@
 
 #string STR_PROPERTIES_MODULE_NAME
 #language en-US
-"SMM Communication ACPI Table DXE Driver"
+"SMM Communication SMM Driver"
-- 
2.7.0.windows.1

Re: [PATCH 1/3] SecurityPkg OpalPasswordSupportLib: Remove include to UefiAcpiDataTable.h

[Yao, Jiewen]

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 <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Eric
> Dong <dong.eric@intel.com>
> Subject: [PATCH 1/3] SecurityPkg OpalPasswordSupportLib: Remove include to
> UefiAcpiDataTable.h
> 
> Remove redundant include to UefiAcpiDataTable.h as
> SmmCommunication.h will help to include it.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Eric Dong <dong.eric@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h |
> 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git
> a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
> b/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
> index f0ad3a113612..a2115b738653 100644
> ---
> a/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
> +++
> b/SecurityPkg/Library/OpalPasswordSupportLib/OpalPasswordSupportNotify.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Implementation of Opal password support library.
> 
> -Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
>  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,7 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND,
> EITHER EXPRESS OR IMPLIED.
>  #include <PiDxe.h>
>  #include <PiSmm.h>
> 
> -#include <Uefi/UefiAcpiDataTable.h>
>  #include <Guid/PiSmmCommunicationRegionTable.h>
>  #include <Library/DebugLib.h>
>  #include <Library/BaseMemoryLib.h>
> --
> 2.7.0.windows.1

Re: [PATCH 2/3] MdePkg: Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table

[Yao, Jiewen]

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 <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>; Gao,
> Liming <liming.gao@intel.com>
> Subject: [PATCH 2/3] MdePkg: Follow UEFI 2.7 spec to deprecate SMM
> Communication ACPI Table
> 
> 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 <jiewen.yao@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@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/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.<BR>
> -This program and the accompanying materials are licensed and made available
> under
> -the terms and conditions of the BSD License that 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.
> -
> -**/
> -
> -#ifndef __PI_SMM_COMMUNICATION_ACPI_TABLE__
> -#define __PI_SMM_COMMUNICATION_ACPI_TABLE__
> -
> -#include <Uefi/UefiAcpiDataTable.h>
> -
> -#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 @@
> 
>    Root include file for Mde Package SMM modules.
> 
> -Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
>  This program and the accompanying materials are licensed and made available
> under
>  the terms and conditions of the BSD License that accompanies this distribution.
>  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 <Uefi/UefiSpec.h>
> 
>  #include <Pi/PiSmmCis.h>
> -#include <Pi/PiSmmCommunicationAcpiTable.h>
> 
>  #endif
> 
> 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 outside of
> SMM and SMI
>    handlers inside of SMM.
> 
> -  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
>    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_
> 
> -//
> -// Need include this header file for EFI_SMM_COMMUNICATE_HEADER data
> structure.
> -//
> -#include <Uefi/UefiAcpiDataTable.h>
> +#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 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()
> 
>  #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.
> 
> -Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
>  This program and the accompanying materials are licensed and made available
> under
>  the terms and conditions of the BSD License that accompanies this distribution.
>  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 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()
> 
>  #endif
> --
> 2.7.0.windows.1

Re: [PATCH 3/3] UefiCpuPkg PiSmmCommunicationSmm: Deprecate SMM Communication ACPI Table

[Yao, Jiewen]

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 <star.zeng@intel.com>; Jiewen Yao <jienwen.yao@intel.com>; Fan,
> Jeff <jeff.fan@intel.com>
> Subject: [PATCH 3/3] UefiCpuPkg PiSmmCommunicationSmm: Deprecate SMM
> Communication ACPI Table
> 
> Follow UEFI 2.7 spec to deprecate SMM Communication ACPI Table,
> PiSmmCommunicationSmm will not install SMM Communication ACPI Table
> anymore.
> 
> Cc: Jiewen Yao <jienwen.yao@intel.com>
> Cc: Jeff Fan <jeff.fan@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  .../PiSmmCommunication/PiSmmCommunicationSmm.c     | 60
> +---------------------
>  .../PiSmmCommunication/PiSmmCommunicationSmm.inf   | 29 ++---------
>  .../PiSmmCommunication/PiSmmCommunicationSmm.uni   | 14 ++---
>  .../PiSmmCommunicationSmmExtra.uni                 |  4 +-
>  4 files changed, 13 insertions(+), 94 deletions(-)
> 
> diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
> b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
> index 077eacce88d1..2b395f38da64 100644
> --- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
> +++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.c
> @@ -1,7 +1,7 @@
>  /** @file
>  PiSmmCommunication SMM Driver.
> 
> -Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
>  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 @@ -19,16 +19,11 @@
> WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
>  #include <Library/SmmServicesTableLib.h>  #include <Library/BaseLib.h>
> #include <Library/BaseMemoryLib.h> -#include <Library/HobLib.h>  #include
> <Library/DebugLib.h>  #include <Library/SmmMemLib.h> -#include
> <Library/PcdLib.h>  #include <Protocol/SmmSwDispatch2.h> -#include
> <Protocol/SmmReadyToLock.h>  #include <Protocol/SmmCommunication.h>
> -#include <Protocol/AcpiTable.h>  #include <Ppi/SmmCommunication.h>
> -#include <Guid/Acpi.h>
> 
>  #include "PiSmmCommunicationPrivate.h"
> 
> @@ -36,26 +31,6 @@ EFI_SMM_COMMUNICATION_CONTEXT
> mSmmCommunicationContext = {
>    SMM_COMMUNICATION_SIGNATURE
>  };
> 
> -EFI_SMM_COMMUNICATION_ACPI_TABLE  mSmmCommunicationAcpiTable =
> {
> -  {
> -    {
> -      EFI_ACPI_4_0_UEFI_ACPI_DATA_TABLE_SIGNATURE,
> -      sizeof (EFI_SMM_COMMUNICATION_ACPI_TABLE),
> -      0x1,   // Revision
> -      0x0,   // Checksum
> -      {0x0}, // OemId[6]
> -      0x0,   // OemTableId
> -      0x0,   // OemRevision
> -      0x0,   // CreatorId
> -      0x0    // CreatorRevision
> -    },
> -    {0x0},                                                      //
> Identifier
> -    OFFSET_OF (EFI_SMM_COMMUNICATION_ACPI_TABLE, SwSmiNumber)
> // DataOffset
> -  },
> -  0x0,                                                   //
> SwSmiNumber
> -  0x0                                                    //
> BufferPtrAddress
> -};
> -
>  /**
>    Set SMM communication context.
>  **/
> @@ -200,22 +175,8 @@ PiSmmCommunicationSmmEntryPoint (
>    EFI_SMM_SW_DISPATCH2_PROTOCOL *SmmSwDispatch2;
>    EFI_SMM_SW_REGISTER_CONTEXT   SmmSwDispatchContext;
>    EFI_HANDLE                    DispatchHandle;
> -  EFI_ACPI_TABLE_PROTOCOL       *AcpiTableProtocol;
> -  UINTN                         TableKey;
> -  UINT64                        OemTableId;
>    EFI_PHYSICAL_ADDRESS          *BufferPtrAddress;
> 
> -  CopyMem (
> -    mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemId,
> -    PcdGetPtr (PcdAcpiDefaultOemId),
> -    sizeof (mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemId)
> -    );
> -  OemTableId = PcdGet64 (PcdAcpiDefaultOemTableId);
> -  CopyMem
> (&mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemTableId,
> &OemTableId, sizeof (UINT64));
> -  mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.OemRevision
> = PcdGet32 (PcdAcpiDefaultOemRevision);
> -  mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.CreatorId
> = PcdGet32 (PcdAcpiDefaultCreatorId);
> -  mSmmCommunicationAcpiTable.UefiAcpiDataTable.Header.CreatorRevision
> = PcdGet32 (PcdAcpiDefaultCreatorRevision);
> -
>    //
>    // Register software SMI handler
>    //
> @@ -237,32 +198,15 @@ PiSmmCommunicationSmmEntryPoint (
> 
>    DEBUG ((EFI_D_INFO, "SmmCommunication SwSmi: %x\n",
> (UINTN)SmmSwDispatchContext.SwSmiInputValue));
> 
> -  //
> -  // Set ACPI table
> -  //
> -  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **)
> &AcpiTableProtocol);
> -  ASSERT_EFI_ERROR (Status);
> -
> -  mSmmCommunicationAcpiTable.SwSmiNumber =
> (UINT32)SmmSwDispatchContext.SwSmiInputValue;
>    BufferPtrAddress = AllocateAcpiNvsMemoryBelow4G
> (sizeof(EFI_PHYSICAL_ADDRESS));
>    ASSERT (BufferPtrAddress != NULL);
>    DEBUG ((EFI_D_INFO, "SmmCommunication BufferPtrAddress: 0x%016lx,
> BufferPtr: 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress,
> *BufferPtrAddress));
> -  mSmmCommunicationAcpiTable.BufferPtrAddress =
> (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress;
> -  CopyMem (&mSmmCommunicationAcpiTable.UefiAcpiDataTable.Identifier,
> &gEfiSmmCommunicationProtocolGuid,
> sizeof(gEfiSmmCommunicationProtocolGuid));
> -
> -  Status = AcpiTableProtocol->InstallAcpiTable (
> -                                AcpiTableProtocol,
> -                                &mSmmCommunicationAcpiTable,
> -                                sizeof(mSmmCommunicationAcpiTable),
> -                                &TableKey
> -                                );
> -  ASSERT_EFI_ERROR (Status);
> 
>    //
>    // Save context
>    //
>    mSmmCommunicationContext.SwSmiNumber =
> (UINT32)SmmSwDispatchContext.SwSmiInputValue;
> -  mSmmCommunicationContext.BufferPtrAddress =
> mSmmCommunicationAcpiTable.BufferPtrAddress;
> +  mSmmCommunicationContext.BufferPtrAddress =
> + (EFI_PHYSICAL_ADDRESS)(UINTN)BufferPtrAddress;
>    SetCommunicationContext ();
> 
>    return Status;
> diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
> b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
> index 9b03837cf3f1..67799e9436cd 100644
> --- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
> +++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.inf
> @@ -1,12 +1,8 @@
>  ## @file
> -# PI SMM Communication SMM driver that installs the SMM Communication
> ACPI Table.
> +# PI SMM Communication SMM driver that saves SMM communication context
> +# for use by SMM Communication PEIM in the S3 boot mode.
>  #
> -# This SMM driver installs the SMM Communication ACPI Table defined in the
> UEFI spec -# which provides a mechanism that can be used in the OS present
> environment by -# non-firmware agents for inter-mode communication with
> SMM agents. It also saves -# SMM communication context for use by SMM
> Communication PEIM in the S3 boot mode.
> -#
> -# Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2010 - 2017, Intel Corporation. All rights
> +reserved.<BR>
>  #
>  # This program and the accompanying materials  # are licensed and made
> available under the terms and conditions of the BSD License @@ -49,34 +45,17
> @@ [LibraryClasses]
>    SmmServicesTableLib
>    BaseLib
>    BaseMemoryLib
> -  HobLib
>    DebugLib
>    SmmMemLib
> -  PcdLib
> -
> -[Guids]
> -  gEfiAcpi20TableGuid                ## SOMETIMES_CONSUMES  ##
> SystemTable
> -  gEfiAcpi10TableGuid                ## SOMETIMES_CONSUMES  ##
> SystemTable
> -  gEfiAcpiTableGuid                  ## SOMETIMES_CONSUMES  ##
> SystemTable
> 
>  [Ppis]
>    gEfiPeiSmmCommunicationPpiGuid     ## UNDEFINED # SMM
> Configuration Table
> 
>  [Protocols]
>    gEfiSmmSwDispatch2ProtocolGuid     ## CONSUMES
> -  gEfiSmmCommunicationProtocolGuid   ## UNDEFINED # SMM
> Communication ACPI Table GUID
> -  gEfiAcpiTableProtocolGuid          ## CONSUMES
> -
> -[Pcd]
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId             ##
> CONSUMES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId        ##
> CONSUMES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision       ##
> CONSUMES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId         ##
> CONSUMES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision   ##
> CONSUMES
> 
>  [Depex]
> -  gEfiSmmSwDispatch2ProtocolGuid AND
> -  gEfiAcpiTableProtocolGuid
> +  gEfiSmmSwDispatch2ProtocolGuid
> 
>  [UserExtensions.TianoCore."ExtraFiles"]
>    PiSmmCommunicationSmmExtra.uni
> diff --git a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
> b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
> index 55df3905df08..9995b4ec7d9d 100644
> --- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
> +++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmm.uni
> @@ -1,12 +1,8 @@
>  // /** @file
> -// PI SMM Communication SMM driver that installs the SMM Communication
> ACPI Table.
> +// PI SMM Communication SMM driver that saves SMM communication context
> +// for use by SMM Communication PEIM in the S3 boot mode.
>  //
> -// This SMM driver installs the SMM Communication ACPI Table defined in the
> UEFI spec -// which provides a mechanism that can be used in the OS present
> environment by -// non-firmware agents for inter-mode communication with
> SMM agents. It also saves -// SMM communication context for use by SMM
> Communication PEIM in the S3 boot mode.
> -//
> -// Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
> +// Copyright (c) 2010 - 2017, Intel Corporation. All rights
> +reserved.<BR>
>  //
>  // This program and the accompanying materials  // are licensed and made
> available under the terms and conditions of the BSD License @@ -18,6 +14,6 @@
> //  // **/
> 
> -#string STR_MODULE_ABSTRACT             #language en-US "PI SMM
> Communication SMM driver that installs the SMM Communication ACPI Table"
> +#string STR_MODULE_ABSTRACT             #language en-US "PI SMM
> Communication SMM driver that saves SMM communication context"
> 
> -#string STR_MODULE_DESCRIPTION          #language en-US "This SMM
> driver installs the SMM Communication ACPI Table defined in the UEFI
> Specification, which provides a mechanism that can be used in the OS-present
> environment by non-firmware agents for inter-mode communication with SMM
> agents. It also saves an SMM communication context for use by SMM
> Communication PEIM in the S3 boot mode."
> +#string STR_MODULE_DESCRIPTION          #language en-US "PI SMM
> Communication SMM driver that saves SMM communication context for use by
> SMM Communication PEIM in the S3 boot mode."
> diff --git
> a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
> b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
> index 34e7731fb5ae..bb7ce62dc589 100644
> --- a/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
> +++ b/UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationSmmExtra.uni
> @@ -1,7 +1,7 @@
>  // /** @file
>  // PiSmmCommunicationSmm Localized Strings and Content  // -// Copyright (c)
> 2013 - 2014, Intel Corporation. All rights reserved.<BR>
> +// Copyright (c) 2013 - 2017, Intel Corporation. All rights
> +reserved.<BR>
>  //
>  // This program and the accompanying materials  // are licensed and made
> available under the terms and conditions of the BSD License @@ -15,4 +15,4 @@
> 
>  #string STR_PROPERTIES_MODULE_NAME
>  #language en-US
> -"SMM Communication ACPI Table DXE Driver"
> +"SMM Communication SMM Driver"
> --
> 2.7.0.windows.1