X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkPkg%2FLibrary%2FDxeIoLibCpuIo%2FIoLib.c;h=eb846e08adb8f25865a1fcdf6bbbd0701d624d45;hp=e124e39b6cae59ddfeaf9c75bcb4e2cc4a5e09da;hb=0677cc4925d580f7016ac092dc591be0ebe03495;hpb=53f93f7ec59b51d896a2573e74edad19cad115fb
diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index e124e39b6c..eb846e08ad 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -1,8 +1,10 @@
/** @file
I/O Library.
-
- Copyright (c) 2006, Intel Corporation
- All rights reserved. This program and the accompanying materials
+ The implementation of I/O operation for this library instance
+ are based on EFI_CPU_IO_PROTOCOL.
+
+ Copyright (c) 2006 - 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
@@ -14,18 +16,13 @@
**/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
#include "DxeCpuIoLibInternal.h"
//
// Globle varible to cache pointer to CpuIo protocol.
//
-STATIC EFI_CPU_IO_PROTOCOL *mCpuIo = NULL;
-STATIC EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *mPciRootBridgeIo = NULL;
+EFI_CPU_IO_PROTOCOL *mCpuIo = NULL;
/**
The constructor function caches the pointer to CpuIo protocol.
@@ -46,12 +43,9 @@ IoLibConstructor (
IN EFI_SYSTEM_TABLE *SystemTable
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
- Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, &mPciRootBridgeIo);
- if (EFI_ERROR (Status)) {
- Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &mCpuIo);
- }
+ Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);
ASSERT_EFI_ERROR (Status);
return Status;
@@ -74,18 +68,14 @@ IoLibConstructor (
UINT64
EFIAPI
IoReadWorker (
- IN UINTN Port,
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width
+ IN UINTN Port,
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width
)
{
EFI_STATUS Status;
UINT64 Data;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, Width, Port, 1, &Data);
- } else {
- Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);
- }
+ Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -109,18 +99,14 @@ IoReadWorker (
UINT64
EFIAPI
IoWriteWorker (
- IN UINTN Port,
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
- IN UINT64 Data
+ IN UINTN Port,
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
+ IN UINT64 Data
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, Width, Port, 1, &Data);
- } else {
- Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);
- }
+ Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -143,18 +129,14 @@ IoWriteWorker (
UINT64
EFIAPI
MmioReadWorker (
- IN UINTN Address,
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width
+ IN UINTN Address,
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width
)
{
- EFI_STATUS Status;
- UINT64 Data;
+ EFI_STATUS Status;
+ UINT64 Data;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, Width, Address, 1, &Data);
- } else {
- Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
- }
+ Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -170,25 +152,22 @@ MmioReadWorker (
@param Address The MMIO register to read.
The caller is responsible for aligning the Address if required.
@param Width The width of the I/O operation.
-
+ @param Data The value to write to the I/O port.
+
@return Data read from registers in the EFI system memory space.
**/
UINT64
EFIAPI
MmioWriteWorker (
- IN UINTN Address,
- IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
- IN UINT64 Data
+ IN UINTN Address,
+ IN EFI_CPU_IO_PROTOCOL_WIDTH Width,
+ IN UINT64 Data
)
{
- EFI_STATUS Status;
+ EFI_STATUS Status;
- if (mPciRootBridgeIo != NULL) {
- Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, Width, Address, 1, &Data);
- } else {
- Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);
- }
+ Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);
ASSERT_EFI_ERROR (Status);
return Data;
@@ -249,6 +228,8 @@ IoWrite8 (
This function must guarantee that all I/O read and write operations are
serialized.
+ If Port is not aligned on a 16-bit boundary, then ASSERT().
+
If 16-bit I/O port operations are not supported, then ASSERT().
@param Port The I/O port to read.
@@ -276,6 +257,8 @@ IoRead16 (
and returns Value. This function must guarantee that all I/O read and write
operations are serialized.
+ If Port is not aligned on a 16-bit boundary, then ASSERT().
+
If 16-bit I/O port operations are not supported, then ASSERT().
@param Port The I/O port to write.
@@ -304,6 +287,8 @@ IoWrite16 (
Reads the 32-bit I/O port specified by Port. The 32-bit read value is returned.
This function must guarantee that all I/O read and write operations are
serialized.
+
+ If Port is not aligned on a 32-bit boundary, then ASSERT().
If 32-bit I/O port operations are not supported, then ASSERT().
@@ -332,6 +317,8 @@ IoRead32 (
and returns Value. This function must guarantee that all I/O read and write
operations are serialized.
+ If Port is not aligned on a 32-bit boundary, then ASSERT().
+
If 32-bit I/O port operations are not supported, then ASSERT().
@param Port The I/O port to write.
@@ -361,6 +348,8 @@ IoWrite32 (
This function must guarantee that all I/O read and write operations are
serialized.
+ If Port is not aligned on a 64-bit boundary, then ASSERT().
+
If 64-bit I/O port operations are not supported, then ASSERT().
@param Port The I/O port to read.
@@ -388,6 +377,8 @@ IoRead64 (
and returns Value. This function must guarantee that all I/O read and write
operations are serialized.
+ If Port is not aligned on a 64-bit boundary, then ASSERT().
+
If 64-bit I/O port operations are not supported, then ASSERT().
@param Port The I/O port to write.
@@ -463,6 +454,8 @@ MmioWrite8 (
returned. This function must guarantee that all MMIO read and write
operations are serialized.
+ If Address is not aligned on a 16-bit boundary, then ASSERT().
+
If 16-bit MMIO register operations are not supported, then ASSERT().
@param Address The MMIO register to read.
@@ -490,6 +483,8 @@ MmioRead16 (
by Value and returns Value. This function must guarantee that all MMIO read
and write operations are serialized.
+ If Address is not aligned on a 16-bit boundary, then ASSERT().
+
If 16-bit MMIO register operations are not supported, then ASSERT().
@param Address The MMIO register to write.
@@ -517,6 +512,8 @@ MmioWrite16 (
returned. This function must guarantee that all MMIO read and write
operations are serialized.
+ If Address is not aligned on a 32-bit boundary, then ASSERT().
+
If 32-bit MMIO register operations are not supported, then ASSERT().
@param Address The MMIO register to read.
@@ -544,6 +541,8 @@ MmioRead32 (
by Value and returns Value. This function must guarantee that all MMIO read
and write operations are serialized.
+ If Address is not aligned on a 32-bit boundary, then ASSERT().
+
If 32-bit MMIO register operations are not supported, then ASSERT().
@param Address The MMIO register to write.
@@ -571,6 +570,8 @@ MmioWrite32 (
returned. This function must guarantee that all MMIO read and write
operations are serialized.
+ If Address is not aligned on a 64-bit boundary, then ASSERT().
+
If 64-bit MMIO register operations are not supported, then ASSERT().
@param Address The MMIO register to read.
@@ -598,6 +599,8 @@ MmioRead64 (
by Value and returns Value. This function must guarantee that all MMIO read
and write operations are serialized.
+ If Address is not aligned on a 64-bit boundary, then ASSERT().
+
If 64-bit MMIO register operations are not supported, then ASSERT().
@param Address The MMIO register to write.