summaryrefslogtreecommitdiff
path: root/MdePkg
diff options
context:
space:
mode:
authormdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>2010-01-14 04:20:04 +0000
committermdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>2010-01-14 04:20:04 +0000
commit8fc71decbe7ada34f96f04261e680265ce916a51 (patch)
tree623cac1ad66adc1958ef5b00db8a37080d925a21 /MdePkg
parentf659880bfa42ded20a00d3e371c998b42dcdd0fd (diff)
downloadedk2-platforms-8fc71decbe7ada34f96f04261e680265ce916a51.tar.xz
Change SMM CPU I/O to SMM CPU I/O 2
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9735 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg')
-rw-r--r--MdePkg/Include/Pi/PiSmmCis.h6
-rw-r--r--MdePkg/Include/Protocol/SmmCpuIo.h96
-rw-r--r--MdePkg/Include/Protocol/SmmCpuIo2.h105
-rw-r--r--MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c (renamed from MdePkg/Library/SmmIoLibCpuIo/IoHighLevel.c)5
-rw-r--r--MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c (renamed from MdePkg/Library/SmmIoLibCpuIo/IoLib.c)37
-rw-r--r--MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c (renamed from MdePkg/Library/SmmIoLibCpuIo/IoLibMmioBuffer.c)5
-rw-r--r--MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h (renamed from MdePkg/Library/SmmIoLibCpuIo/SmmCpuIoLibInternal.h)7
-rw-r--r--MdePkg/Library/SmmIoLibSmmCpuIo2/SmmIoLibSmmCpuIo2.inf (renamed from MdePkg/Library/SmmIoLibCpuIo/SmmIoLibCpuIo.inf)15
-rw-r--r--MdePkg/MdePkg.dec6
-rw-r--r--MdePkg/MdePkg.dsc2
10 files changed, 128 insertions, 156 deletions
diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 52eaea560d..597eeb9086 100644
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -2,7 +2,7 @@
Common definitions in the Platform Initialization Specification version 1.2
VOLUME 4 System Management Mode Core Interface version.
- Copyright (c) 2009, Intel Corporation
+ Copyright (c) 2009 - 2010, 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
@@ -17,7 +17,7 @@
#define _PI_SMMCIS_H_
#include <Pi/PiMultiPhase.h>
-#include <Protocol/SmmCpuIo.h>
+#include <Protocol/SmmCpuIo2.h>
///
/// Note:
@@ -280,7 +280,7 @@ struct _EFI_SMM_SYSTEM_TABLE2 {
///
/// I/O Service
///
- EFI_SMM_CPU_IO_PROTOCOL SmmIo;
+ EFI_SMM_CPU_IO2_PROTOCOL SmmIo;
///
/// Runtime memory services
diff --git a/MdePkg/Include/Protocol/SmmCpuIo.h b/MdePkg/Include/Protocol/SmmCpuIo.h
deleted file mode 100644
index 3418d43c79..0000000000
--- a/MdePkg/Include/Protocol/SmmCpuIo.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/** @file
- SMM CPU I/O protocol as defined in the PI 1.2 specification.
-
- This protocol provides CPU I/O and memory access within SMM.
-
- Copyright (c) 2009, 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
-
- 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 _SMM_CPU_IO_H_
-#define _SMM_CPU_IO_H_
-
-///
-/// Note:
-/// To avoid name conflict between PI and Framework SMM spec, the following names defined
-/// in PI 1.2 SMM spec are renamed. These renamings are not yet in a public PI spec and errta.
-///
-/// EFI_SMM_CPU_IO -> EFI_SMM_CPU_IO2
-/// EFI_SMM_IO_ACCESS -> EFI_SMM_IO_ACCESS2
-///
-
-#define EFI_SMM_CPU_IO_PROTOCOL_GUID \
- { \
- 0x3242A9D8, 0xCE70, 0x4AA0, { 0x95, 0x5D, 0x5E, 0x7B, 0x14, 0x0D, 0xE4, 0xD2 } \
- }
-
-typedef struct _EFI_SMM_CPU_IO_PROTOCOL EFI_SMM_CPU_IO_PROTOCOL;
-
-///
-/// Width of the SMM CPU I/O operations
-///
-typedef enum {
- SMM_IO_UINT8 = 0,
- SMM_IO_UINT16 = 1,
- SMM_IO_UINT32 = 2,
- SMM_IO_UINT64 = 3
-} EFI_SMM_IO_WIDTH;
-
-/**
- Provides the basic memory and I/O interfaces used toabstract accesses to devices.
-
- The I/O operations are carried out exactly as requested. The caller is responsible for any alignment
- and I/O width issues that the bus, device, platform, or type of I/O might require.
-
- @param[in] This The EFI_SMM_CPU_IO_PROTOCOL instance.
- @param[in] Width Signifies the width of the I/O operations.
- @param[in] Address The base address of the I/O operations.
- The caller is responsible for aligning the Address if required.
- @param[in] Count The number of I/O operations to perform.
- @param[in,out] Buffer For read operations, the destination buffer to store the results.
- For write operations, the source buffer from which to write data.
-
- @retval EFI_SUCCESS The data was read from or written to the device.
- @retval EFI_UNSUPPORTED The Address is not valid for this system.
- @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
- @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources.
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_SMM_CPU_IO2)(
- IN CONST EFI_SMM_CPU_IO_PROTOCOL *This,
- IN EFI_SMM_IO_WIDTH Width,
- IN UINT64 Address,
- IN UINTN Count,
- IN OUT VOID *Buffer
- );
-
-typedef struct {
- ///
- /// This service provides the various modalities of memory and I/O read.
- ///
- EFI_SMM_CPU_IO2 Read;
- ///
- /// This service provides the various modalities of memory and I/O write.
- ///
- EFI_SMM_CPU_IO2 Write;
-} EFI_SMM_IO_ACCESS2;
-
-///
-/// SMM CPU I/O Protocol provides CPU I/O and memory access within SMM.
-///
-struct _EFI_SMM_CPU_IO_PROTOCOL {
- EFI_SMM_IO_ACCESS2 Mem; ///< Allows reads and writes to memory-mapped I/O space.
- EFI_SMM_IO_ACCESS2 Io; ///< Allows reads and writes to I/O space.
-};
-
-extern EFI_GUID gEfiSmmCpuIoProtocolGuid;
-
-#endif
diff --git a/MdePkg/Include/Protocol/SmmCpuIo2.h b/MdePkg/Include/Protocol/SmmCpuIo2.h
new file mode 100644
index 0000000000..580a8b6eac
--- /dev/null
+++ b/MdePkg/Include/Protocol/SmmCpuIo2.h
@@ -0,0 +1,105 @@
+/** @file
+ SMM CPU I/O 2 protocol as defined in the PI 1.2 specification.
+
+ This protocol provides CPU I/O and memory access within SMM.
+
+ Copyright (c) 2009 - 2010, 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
+
+ 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 _SMM_CPU_IO2_H_
+#define _SMM_CPU_IO2_H_
+
+///
+/// Note:
+/// To avoid name conflict between PI and Framework SMM spec, the following names defined
+/// in PI 1.2 SMM spec are renamed.
+///
+/// *EFI_SMM_CPU_IO* -> *EFI_SMM_CPU_IO2*
+/// *EFI_SMM_IO_ACCESS* -> *EFI_SMM_IO_ACCESS2*
+///
+
+#define EFI_SMM_CPU_IO2_PROTOCOL_GUID \
+ { \
+ 0x3242A9D8, 0xCE70, 0x4AA0, { 0x95, 0x5D, 0x5E, 0x7B, 0x14, 0x0D, 0xE4, 0xD2 } \
+ }
+
+typedef struct _EFI_SMM_CPU_IO2_PROTOCOL EFI_SMM_CPU_IO2_PROTOCOL;
+
+///
+/// Width of the SMM CPU I/O operations
+///
+typedef enum {
+ SMM_IO_UINT8 = 0,
+ SMM_IO_UINT16 = 1,
+ SMM_IO_UINT32 = 2,
+ SMM_IO_UINT64 = 3
+} EFI_SMM_IO_WIDTH;
+
+/**
+ Provides the basic memory and I/O interfaces used toabstract accesses to devices.
+
+ The I/O operations are carried out exactly as requested. The caller is
+ responsible for any alignment and I/O width issues that the bus, device,
+ platform, or type of I/O might require.
+
+ @param[in] This The EFI_SMM_CPU_IO2_PROTOCOL instance.
+ @param[in] Width Signifies the width of the I/O operations.
+ @param[in] Address The base address of the I/O operations. The caller is
+ responsible for aligning the Address if required.
+ @param[in] Count The number of I/O operations to perform.
+ @param[in,out] Buffer For read operations, the destination buffer to store
+ the results. For write operations, the source buffer
+ from which to write data.
+
+ @retval EFI_SUCCESS The data was read from or written to the device.
+ @retval EFI_UNSUPPORTED The Address is not valid for this system.
+ @retval EFI_INVALID_PARAMETER Width or Count, or both, were invalid.
+ @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack
+ of resources.
+**/
+typedef
+EFI_STATUS
+(EFIAPI *EFI_SMM_CPU_IO2)(
+ IN CONST EFI_SMM_CPU_IO2_PROTOCOL *This,
+ IN EFI_SMM_IO_WIDTH Width,
+ IN UINT64 Address,
+ IN UINTN Count,
+ IN OUT VOID *Buffer
+ );
+
+typedef struct {
+ ///
+ /// This service provides the various modalities of memory and I/O read.
+ ///
+ EFI_SMM_CPU_IO2 Read;
+ ///
+ /// This service provides the various modalities of memory and I/O write.
+ ///
+ EFI_SMM_CPU_IO2 Write;
+} EFI_SMM_IO_ACCESS2;
+
+///
+/// SMM CPU I/O Protocol provides CPU I/O and memory access within SMM.
+///
+struct _EFI_SMM_CPU_IO2_PROTOCOL {
+ ///
+ /// Allows reads and writes to memory-mapped I/O space.
+ ///
+ EFI_SMM_IO_ACCESS2 Mem;
+ ///
+ /// Allows reads and writes to I/O space.
+ ///
+ EFI_SMM_IO_ACCESS2 Io;
+};
+
+extern EFI_GUID gEfiSmmCpuIo2ProtocolGuid;
+
+#endif
diff --git a/MdePkg/Library/SmmIoLibCpuIo/IoHighLevel.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c
index 72ea425663..ae772b81bc 100644
--- a/MdePkg/Library/SmmIoLibCpuIo/IoHighLevel.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c
@@ -4,7 +4,7 @@
All assertions for bit field operations are handled bit field functions in the
Base Library.
- Copyright (c) 2009, Intel Corporation<BR>
+ Copyright (c) 2009 - 2010, Intel Corporation<BR>
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
@@ -13,8 +13,6 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- Module Name: IoHighLevel.c
-
The following IoLib instances share the same version of this file:
BaseIoLibIntrinsic
@@ -23,7 +21,6 @@
SmmIoLibCpuIo
**/
-
#include "SmmCpuIoLibInternal.h"
/**
diff --git a/MdePkg/Library/SmmIoLibCpuIo/IoLib.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
index 4b74e9c222..53003d123d 100644
--- a/MdePkg/Library/SmmIoLibCpuIo/IoLib.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
@@ -3,7 +3,7 @@
The implementation of I/O operation for this library instance
are based on EFI_CPU_IO_PROTOCOL.
- Copyright (c) 2009, Intel Corporation<BR>
+ Copyright (c) 2009 - 2010, Intel Corporation<BR>
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
@@ -12,18 +12,14 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- Module Name: IoLib.c
-
**/
-
#include "SmmCpuIoLibInternal.h"
//
// Globle varible to cache pointer to CpuIo protocol.
//
-EFI_SMM_CPU_IO_PROTOCOL *mCpuIo = NULL;
-EFI_SMM_PCI_ROOT_BRIDGE_IO_PROTOCOL *mPciRootBridgeIo = NULL;
+EFI_SMM_CPU_IO2_PROTOCOL *mCpuIo2 = NULL;
/**
The constructor function caches the pointer to CpuIo protocol.
@@ -46,10 +42,7 @@ IoLibConstructor (
{
EFI_STATUS Status;
- Status = gSmst->SmmLocateProtocol (&gEfiSmmPciRootBridgeIoProtocolGuid, NULL, (VOID **) &mPciRootBridgeIo);
- if (EFI_ERROR (Status)) {
- Status = gSmst->SmmLocateProtocol (&gEfiSmmCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);
- }
+ Status = gSmst->SmmLocateProtocol (&gEfiSmmCpuIo2ProtocolGuid, NULL, (VOID **) &mCpuIo2);
ASSERT_EFI_ERROR (Status);
return Status;
@@ -79,11 +72,7 @@ IoReadWorker (
EFI_STATUS Status;
UINT64 Data;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);
- } else {
- Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);
- }
+ Status = mCpuIo2->Io.Read (mCpuIo2, Width, Port, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -114,11 +103,7 @@ IoWriteWorker (
{
EFI_STATUS Status;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);
- } else {
- Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);
- }
+ Status = mCpuIo2->Io.Write (mCpuIo2, Width, Port, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -148,11 +133,7 @@ MmioReadWorker (
EFI_STATUS Status;
UINT64 Data;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);
- } else {
- Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
- }
+ Status = mCpuIo2->Mem.Read (mCpuIo2, Width, Address, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -183,11 +164,7 @@ MmioWriteWorker (
{
EFI_STATUS Status;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);
- } else {
- Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);
- }
+ Status = mCpuIo2->Mem.Write (mCpuIo2, Width, Address, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
diff --git a/MdePkg/Library/SmmIoLibCpuIo/IoLibMmioBuffer.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c
index e4effa9602..35b6c0a8a7 100644
--- a/MdePkg/Library/SmmIoLibCpuIo/IoLibMmioBuffer.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
/** @file
I/O Library MMIO Buffer Functions.
- Copyright (c) 2009, Intel Corporation<BR>
+ Copyright (c) 2009 - 2010, Intel Corporation<BR>
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
@@ -10,11 +10,8 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- Module Name: IoLibMmioBuffer.c
-
**/
-
#include "SmmCpuIoLibInternal.h"
/**
diff --git a/MdePkg/Library/SmmIoLibCpuIo/SmmCpuIoLibInternal.h b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h
index e221bc8d9e..70295af4e1 100644
--- a/MdePkg/Library/SmmIoLibCpuIo/SmmCpuIoLibInternal.h
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmCpuIoLibInternal.h
@@ -4,7 +4,7 @@
for implementation of IoLib library instance. It is included
all source code of this library instance.
- Copyright (c) 2009, Intel Corporation
+ Copyright (c) 2009 - 2010, 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
@@ -13,16 +13,13 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
- Module Name: DxeCpuIoLibInternal.h
-
**/
#ifndef _SMM_CPUIO_LIB_INTERNAL_H_
#define _SMM_CPUIO_LIB_INTERNAL_H_
-
#include <PiSmm.h>
-#include <Protocol/SmmCpuIo.h>
+#include <Protocol/SmmCpuIo2.h>
#include <Protocol/SmmPciRootBridgeIo.h>
#include <Library/IoLib.h>
#include <Library/DebugLib.h>
diff --git a/MdePkg/Library/SmmIoLibCpuIo/SmmIoLibCpuIo.inf b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmIoLibSmmCpuIo2.inf
index 7be09dc878..b9a34a40ee 100644
--- a/MdePkg/Library/SmmIoLibCpuIo/SmmIoLibCpuIo.inf
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/SmmIoLibSmmCpuIo2.inf
@@ -3,7 +3,7 @@
#
# I/O Library implementation that uses the CPU I/O Protocol for I/O
# and MMIO operations.
-# Copyright (c) 2009, Intel Corporation.
+# Copyright (c) 2009 - 2010, 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
@@ -12,19 +12,16 @@
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-#
#**/
[Defines]
INF_VERSION = 0x00010005
- BASE_NAME = SmmIoLibCpuIo
+ BASE_NAME = SmmIoLibSmmCpuIo2
FILE_GUID = DEEEA15E-4A77-4513-BA75-71D26FEF78A1
MODULE_TYPE = DXE_SMM_DRIVER
VERSION_STRING = 1.0
LIBRARY_CLASS = IoLib|DXE_SMM_DRIVER SMM_CORE
- EFI_SPECIFICATION_VERSION = 0x00020000
PI_SPECIFICATION_VERSION = 0x0001000A
-
CONSTRUCTOR = IoLibConstructor
#
@@ -33,13 +30,12 @@
# VALID_ARCHITECTURES = IA32 X64
#
-[Sources.common]
+[Sources]
IoLibMmioBuffer.c
SmmCpuIoLibInternal.h
IoHighLevel.c
IoLib.c
-
[Packages]
MdePkg/MdePkg.dec
@@ -49,8 +45,7 @@
SmmServicesTableLib
[Protocols]
- gEfiSmmCpuIoProtocolGuid ## CONSUMES
- gEfiSmmPciRootBridgeIoProtocolGuid ## CONSUMES
+ gEfiSmmCpuIo2ProtocolGuid ## CONSUMES
[Depex]
- gEfiSmmCpuIoProtocolGuid OR gEfiSmmPciRootBridgeIoProtocolGuid \ No newline at end of file
+ gEfiSmmCpuIo2ProtocolGuid \ No newline at end of file
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 7fe6daa461..683eefedfe 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -5,7 +5,7 @@
# It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of
# EFI1.10/UEFI2.0/UEFI2.1/PI1.0 and some Industry Standards.
#
-# Copyright (c) 2007 - 2009, Intel Corporation.<BR>
+# Copyright (c) 2007 - 2010, Intel Corporation.<BR>
# Portions copyright (c) 2008-2009 Apple Inc. All rights reserved.<BR>
#
# All rights reserved.
@@ -661,8 +661,8 @@
## Include/Protocol/SuperIo.h
gEfiSioProtocolGuid = { 0x215fdd18, 0xbd50, 0x4feb, { 0x89, 0xb, 0x58, 0xca, 0xb, 0x47, 0x39, 0xe9 }}
- ## Include/Protocol/SmmCpuIo.h
- gEfiSmmCpuIoProtocolGuid = { 0x3242a9d8, 0xce70, 0x4aa0, { 0x95, 0x5d, 0x5e, 0x7b, 0x14, 0x0d, 0xe4, 0xd2 }}
+ ## Include/Protocol/SmmCpuIo2.h
+ gEfiSmmCpuIo2ProtocolGuid = { 0x3242a9d8, 0xce70, 0x4aa0, { 0x95, 0x5d, 0x5e, 0x7b, 0x14, 0x0d, 0xe4, 0xd2 }}
## Include/Protocol/SmmBase2.h
gEfiSmmBase2ProtocolGuid = { 0xf4ccbfb7, 0xf6e0, 0x47fd, { 0x9d, 0xd4, 0x10, 0xa8, 0xf1, 0x50, 0xc1, 0x91 }}
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 87f2ae2120..30298803d9 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -148,7 +148,7 @@
MdePkg/Library/PeiServicesTablePointerLibIdt/PeiServicesTablePointerLibIdt.inf
MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
- MdePkg/Library/SmmIoLibCpuIo/SmmIoLibCpuIo.inf
+ MdePkg/Library/SmmIoLibSmmCpuIo2/SmmIoLibSmmCpuIo2.inf
MdePkg/Library/SmmPciLibPciRootBridgeIo/SmmPciLibPciRootBridgeIo.inf
MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf