IntelFrameworkModulePkg: Modify CpuIoDxe to support new IoLib library
The IO_PROTOCOL supports Fifo types by invoking the Fifo routines in the new BaseIoLibIntrinsic (IoLib class) library. Cc: Jeff Fan <jeff.fan@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> Signed-off-by: Leo Duran <leo.duran@amd.com> Reviewed-by: Liming Gao <liming.gao@intel.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Jeff Fan <jeff.fan@intel.com>
This commit is contained in:
@ -2,6 +2,8 @@
|
|||||||
Uses the services of the I/O Library to produce the CPU I/O Protocol
|
Uses the services of the I/O Library to produce the CPU I/O Protocol
|
||||||
|
|
||||||
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
|
||||||
|
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
|
||||||
|
|
||||||
This program and the accompanying materials
|
This program and the accompanying materials
|
||||||
are licensed and made available under the terms and conditions of the BSD License
|
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
|
which accompanies this distribution. The full text of the license may be found at
|
||||||
@ -410,6 +412,31 @@ CpuIoServiceRead (
|
|||||||
InStride = mInStride[Width];
|
InStride = mInStride[Width];
|
||||||
OutStride = mOutStride[Width];
|
OutStride = mOutStride[Width];
|
||||||
OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
|
OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
|
||||||
|
|
||||||
|
//
|
||||||
|
// Fifo operations supported for (mInStride[Width] == 0)
|
||||||
|
//
|
||||||
|
if (InStride == 0) {
|
||||||
|
switch (OperationWidth) {
|
||||||
|
case EfiCpuIoWidthUint8:
|
||||||
|
IoReadFifo8 ((UINTN)Address, Count, Buffer);
|
||||||
|
return EFI_SUCCESS;
|
||||||
|
case EfiCpuIoWidthUint16:
|
||||||
|
IoReadFifo16 ((UINTN)Address, Count, Buffer);
|
||||||
|
return EFI_SUCCESS;
|
||||||
|
case EfiCpuIoWidthUint32:
|
||||||
|
IoReadFifo32 ((UINTN)Address, Count, Buffer);
|
||||||
|
return EFI_SUCCESS;
|
||||||
|
default:
|
||||||
|
//
|
||||||
|
// The CpuIoCheckParameter call above will ensure that this
|
||||||
|
// path is not taken.
|
||||||
|
//
|
||||||
|
ASSERT (FALSE);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
|
for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
|
||||||
if (OperationWidth == EfiCpuIoWidthUint8) {
|
if (OperationWidth == EfiCpuIoWidthUint8) {
|
||||||
*Uint8Buffer = IoRead8 ((UINTN)Address);
|
*Uint8Buffer = IoRead8 ((UINTN)Address);
|
||||||
@ -492,6 +519,31 @@ CpuIoServiceWrite (
|
|||||||
InStride = mInStride[Width];
|
InStride = mInStride[Width];
|
||||||
OutStride = mOutStride[Width];
|
OutStride = mOutStride[Width];
|
||||||
OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
|
OperationWidth = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);
|
||||||
|
|
||||||
|
//
|
||||||
|
// Fifo operations supported for (mInStride[Width] == 0)
|
||||||
|
//
|
||||||
|
if (InStride == 0) {
|
||||||
|
switch (OperationWidth) {
|
||||||
|
case EfiCpuIoWidthUint8:
|
||||||
|
IoWriteFifo8 ((UINTN)Address, Count, Buffer);
|
||||||
|
return EFI_SUCCESS;
|
||||||
|
case EfiCpuIoWidthUint16:
|
||||||
|
IoWriteFifo16 ((UINTN)Address, Count, Buffer);
|
||||||
|
return EFI_SUCCESS;
|
||||||
|
case EfiCpuIoWidthUint32:
|
||||||
|
IoWriteFifo32 ((UINTN)Address, Count, Buffer);
|
||||||
|
return EFI_SUCCESS;
|
||||||
|
default:
|
||||||
|
//
|
||||||
|
// The CpuIoCheckParameter call above will ensure that this
|
||||||
|
// path is not taken.
|
||||||
|
//
|
||||||
|
ASSERT (FALSE);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
|
for (Uint8Buffer = (UINT8 *)Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {
|
||||||
if (OperationWidth == EfiCpuIoWidthUint8) {
|
if (OperationWidth == EfiCpuIoWidthUint8) {
|
||||||
IoWrite8 ((UINTN)Address, *Uint8Buffer);
|
IoWrite8 ((UINTN)Address, *Uint8Buffer);
|
||||||
|
Reference in New Issue
Block a user