Ray, In general the code changes looks really good. The CPU I/O protocols is only conditionally used, so the INF should be SOMETIMES_CONSUMES for that protocol.
I can not apply the patch because of an issue with UNI file to try running it. Can you please try regenerating the patch against the latest version of trunk. Thanks, Mike > -----Original Message----- > From: Ni, Ruiyu > Sent: Monday, December 7, 2015 9:15 PM > To: Ni, Ruiyu <ruiyu...@intel.com>; edk2-devel@lists.01.org > Cc: Kinney, Michael D <michael.d.kin...@intel.com> > Subject: RE: [edk2] [Patch V3] ShellPkg/mm: Fix mm to support multiple root > bridge platform > > The V3 version moved the HasRootBridgeIo variable definition to the beginning > of function. > And I sent it through GIT command in case the attachment in V2 mail is > blocked by the lists.01.org. > > Regards, > Ray > > > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Ruiyu > Ni > Sent: Tuesday, December 8, 2015 1:13 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ruiyu <ruiyu...@intel.com>; Kinney, Michael D > <michael.d.kin...@intel.com> > Subject: [edk2] [Patch V3] ShellPkg/mm: Fix mm to support multiple root > bridge platform > > In multiple root bridge platforms, different root bridges may > share the same segment but occupy different range of buses, > or may occupy different segments. > The fix is to find the correct root bridge IO instance by > comparing not only the segment but also the bus ranges. > It tries to access the MMIO and IO in the following order: > PciRootBridgeIo, CpuIo and direct IO. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni <ruiyu...@intel.com> > Cc: Michael.D.Kinney <michael.d.kin...@intel.com> > --- > ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c | 917 > ++++++++++----------- > .../UefiShellDebug1CommandsLib.h | 3 +- > .../UefiShellDebug1CommandsLib.inf | 4 +- > .../UefiShellDebug1CommandsLib.uni | Bin 139696 -> 139230 > bytes > ShellPkg/ShellPkg.dsc | 1 + > 5 files changed, 464 insertions(+), 461 deletions(-) > > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c > index ca64f2c..2f22629 100644 > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Mm.c > @@ -2,7 +2,7 @@ > Main file for Mm shell Debug1 function. > > (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> > - Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2005 - 2015, 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 > @@ -15,16 +15,25 @@ > > #include "UefiShellDebug1CommandsLib.h" > #include <Library/ShellLib.h> > +#include <Library/IoLib.h> > #include <Protocol/PciRootBridgeIo.h> > #include <Protocol/DeviceIo.h> > > typedef enum { > - EfiMemory, > - EFIMemoryMappedIo, > - EfiIo, > - EfiPciConfig, > - EfiPciEConfig > -} EFI_ACCESS_TYPE; > + ShellMmMemory, > + ShellMmMemoryMappedIo, > + ShellMmIo, > + ShellMmPci, > + ShellMmPciExpress > +} SHELL_MM_ACCESS_TYPE; > + > +CONST UINT16 mShellMmAccessTypeStr[] = { > + STRING_TOKEN (STR_MM_MEM), > + STRING_TOKEN (STR_MM_MMIO), > + STRING_TOKEN (STR_MM_IO), > + STRING_TOKEN (STR_MM_PCI), > + STRING_TOKEN (STR_MM_PCIE) > +}; > > STATIC CONST SHELL_PARAM_ITEM ParamList[] = { > {L"-mmio", TypeFlag}, > @@ -37,161 +46,341 @@ STATIC CONST SHELL_PARAM_ITEM ParamList[] = { > {NULL, TypeMax} > }; > > -STATIC CONST UINT64 MaxNum[9] = { 0xff, 0xffff, 0xffffffff, > 0xffffffffffffffffULL }; > +CONST UINT64 mShellMmMaxNumber[] = { > + 0, MAX_UINT8, MAX_UINT16, 0, MAX_UINT32, 0, 0, 0, MAX_UINT64 > +}; > +CONST EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH mShellMmRootBridgeIoWidth[] = { > + 0, EfiPciWidthUint8, EfiPciWidthUint16, 0, EfiPciWidthUint32, 0, 0, 0, > EfiPciWidthUint64 > +}; > +CONST EFI_CPU_IO_PROTOCOL_WIDTH mShellMmCpuIoWidth[] = { > + 0, EfiCpuIoWidthUint8, EfiCpuIoWidthUint16, 0, EfiCpuIoWidthUint32, 0, 0, > 0, EfiCpuIoWidthUint64 > +}; > > /** > - Read some data into a buffer from memory. > - > - @param[in] Width The width of each read. > - @param[in] Addresss The memory location to start reading at. > - @param[in] Size The size of Buffer in Width sized units. > - @param[out] Buffer The buffer to read into. > + Extract the PCI segment, bus, device, function, register from > + from a SHELL_MM_PCI or SHELL_MM_PCIE format of address.. > + > + @param[in] PciFormat Whether the address is of PCI format of PCIE > format. > + @param[in] Address SHELL_MM_PCI or SHELL_MM_PCIE address. > + @param[out] Segment PCI segment number. > + @param[out] Bus PCI bus number. > + @param[out] Device PCI device number. > + @param[out] Function PCI function number. > + @param[out] Register PCI register offset. > **/ > VOID > EFIAPI > -ReadMem ( > - IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width, > - IN UINT64 Address, > - IN UINTN Size, > - OUT VOID *Buffer > +ShellMmDecodePciAddress ( > + IN BOOLEAN PciFormat, > + IN UINT64 Address, > + OUT UINT32 *Segment, > + OUT UINT8 *Bus, > + OUT UINT8 *Device, OPTIONAL > + OUT UINT8 *Function, OPTIONAL > + OUT UINT32 *Register OPTIONAL > ) > { > - // > - // This function is defective. This ASSERT prevents the defect from > affecting anything. > - // > - ASSERT(Size == 1); > - do { > - if (Width == EfiPciWidthUint8) { > - *(UINT8 *) Buffer = *(UINT8 *) (UINTN) Address; > - Address -= 1; > - } else if (Width == EfiPciWidthUint16) { > - *(UINT16 *) Buffer = *(UINT16 *) (UINTN) Address; > - Address -= 2; > - } else if (Width == EfiPciWidthUint32) { > - *(UINT32 *) Buffer = *(UINT32 *) (UINTN) Address; > - Address -= 4; > - } else if (Width == EfiPciWidthUint64) { > - *(UINT64 *) Buffer = *(UINT64 *) (UINTN) Address; > - Address -= 8; > - } else { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_READ_ERROR), > gShellDebug1HiiHandle, L"mm"); > - break; > + if (PciFormat) { > + // > + // PCI Configuration Space.The address will have the format > 0x000000ssbbddffrr, > + // where ss = Segment, bb = Bus, dd = Device, ff = Function and rr = > Register. > + // > + *Segment = (UINT32) (RShiftU64 (Address, 32) & 0xFF); > + *Bus = (UINT8) (((UINT32) Address) >> 24); > + > + if (Device != NULL) { > + *Device = (UINT8) (((UINT32) Address) >> 16); > + } > + if (Function != NULL) { > + *Function = (UINT8) (((UINT32) Address) >> 8); > } > - Size--; > - } while (Size > 0); > + if (Register != NULL) { > + *Register = (UINT8) Address; > + } > + } else { > + // > + // PCI Express Configuration Space.The address will have the format > 0x0000000ssbbddffrrr, > + // where ss = Segment, bb = Bus, dd = Device, ff = Function and rrr = > Register. > + // > + *Segment = (UINT32) (RShiftU64 (Address, 36) & 0xFF); > + *Bus = (UINT8) RShiftU64 (Address, 28); > + if (Device != NULL) { > + *Device = (UINT8) (((UINT32) Address) >> 20); > + } > + if (Function != NULL) { > + *Function = (UINT8) (((UINT32) Address) >> 12); > + } > + if (Register != NULL) { > + *Register = (UINT32) (Address & 0xFFF); > + } > + } > } > > /** > - Write some data to memory. > - > - @param[in] Width The width of each write. > - @param[in] Addresss The memory location to start writing at. > - @param[in] Size The size of Buffer in Width sized units. > - @param[in] Buffer The buffer to write from. > + Read or write some data from or into the Address. > + > + @param[in] AccessType Access type. > + @param[in] PciRootBridgeIo PciRootBridgeIo instance. > + @param[in] CpuIo CpuIo instance. > + @param[in] Read TRUE for read, FALSE for write. > + @param[in] Addresss The memory location to access. > + @param[in] Size The size of Buffer in Width sized units. > + @param[in, out] Buffer The buffer to read into or write from. > **/ > VOID > -EFIAPI > -WriteMem ( > - IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width, > - IN UINT64 Address, > - IN UINTN Size, > - IN VOID *Buffer > +ShellMmAccess ( > + IN SHELL_MM_ACCESS_TYPE AccessType, > + IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo, > + IN EFI_CPU_IO2_PROTOCOL *CpuIo, > + IN BOOLEAN Read, > + IN UINT64 Address, > + IN UINTN Size, > + IN OUT VOID *Buffer > ) > { > - // > - // This function is defective. This ASSERT prevents the defect from > affecting anything. > - // > - ASSERT(Size == 1); > - do { > - if (Width == EfiPciWidthUint8) { > - *(UINT8 *) (UINTN) Address = *(UINT8 *) Buffer; > - Address += 1; > - } else if (Width == EfiPciWidthUint16) { > - *(UINT16 *) (UINTN) Address = *(UINT16 *) Buffer; > - Address += 2; > - } else if (Width == EfiPciWidthUint32) { > - *(UINT32 *) (UINTN) Address = *(UINT32 *) Buffer; > - Address += 4; > - } else if (Width == EfiPciWidthUint64) { > - *(UINT64 *) (UINTN) Address = *(UINT64 *) Buffer; > - Address += 8; > + EFI_STATUS Status; > + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_IO_MEM RootBridgeIoMem; > + EFI_CPU_IO_PROTOCOL_IO_MEM CpuIoMem; > + UINT32 Segment; > + UINT8 Bus; > + UINT8 Device; > + UINT8 Function; > + UINT32 Register; > + > + if (AccessType == ShellMmMemory) { > + if (Read) { > + CopyMem (Buffer, (VOID *) (UINTN) Address, Size); > } else { > + CopyMem ((VOID *) (UINTN) Address, Buffer, Size); > + } > + } else { > + RootBridgeIoMem = NULL; > + CpuIoMem = NULL; > + switch (AccessType) { > + case ShellMmPci: > + case ShellMmPciExpress: > + ASSERT (PciRootBridgeIo != NULL); > + ShellMmDecodePciAddress ((BOOLEAN) (AccessType == ShellMmPci), > Address, &Segment, &Bus, &Device, &Function, &Register); > + if (Read) { > + Status = PciRootBridgeIo->Pci.Read ( > + PciRootBridgeIo, mShellMmRootBridgeIoWidth[Size], > + EFI_PCI_ADDRESS (Bus, Device, Function, Register), > + 1, Buffer > + ); > + } else { > + Status = PciRootBridgeIo->Pci.Write ( > + PciRootBridgeIo, mShellMmRootBridgeIoWidth[Size], > + EFI_PCI_ADDRESS (Bus, Device, Function, Register), > + 1, Buffer > + ); > + } > + ASSERT_EFI_ERROR (Status); > + return; > + > + case ShellMmMemoryMappedIo: > + if (PciRootBridgeIo != NULL) { > + RootBridgeIoMem = Read ? PciRootBridgeIo->Mem.Read : > PciRootBridgeIo->Mem.Write; > + } > + if (CpuIo != NULL) { > + CpuIoMem = Read ? CpuIo->Mem.Read : CpuIo->Mem.Write; > + } > + break; > + > + case ShellMmIo: > + if (PciRootBridgeIo != NULL) { > + RootBridgeIoMem = Read ? PciRootBridgeIo->Io.Read : > PciRootBridgeIo->Io.Write; > + } > + if (CpuIo != NULL) { > + CpuIoMem = Read ? CpuIo->Io.Read : CpuIo->Io.Write; > + } > + break; > + default: > ASSERT (FALSE); > + break; > } > - // > - // > - // > - Size--; > - } while (Size > 0); > + > + Status = EFI_UNSUPPORTED; > + if (RootBridgeIoMem != NULL) { > + Status = RootBridgeIoMem (PciRootBridgeIo, > mShellMmRootBridgeIoWidth[Size], Address, 1, Buffer); > + } > + if (EFI_ERROR (Status) && (CpuIoMem != NULL)) { > + Status = CpuIoMem (CpuIo, mShellMmCpuIoWidth[Size], Address, 1, > Buffer); > + } > + > + if (EFI_ERROR (Status)) { > + if (AccessType == ShellMmIo) { > + switch (Size) { > + case 1: > + if (Read) { > + *(UINT8 *) Buffer = IoRead8 ((UINTN) Address); > + } else { > + IoWrite8 ((UINTN) Address, *(UINT8 *) Buffer); > + } > + break; > + case 2: > + if (Read) { > + *(UINT16 *) Buffer = IoRead16 ((UINTN) Address); > + } else { > + IoWrite16 ((UINTN) Address, *(UINT16 *) Buffer); > + } > + break; > + case 4: > + if (Read) { > + *(UINT32 *) Buffer = IoRead32 ((UINTN) Address); > + } else { > + IoWrite32 ((UINTN) Address, *(UINT32 *) Buffer); > + } > + break; > + case 8: > + if (Read) { > + *(UINT64 *) Buffer = IoRead64 ((UINTN) Address); > + } else { > + IoWrite64 ((UINTN) Address, *(UINT64 *) Buffer); > + } > + break; > + default: > + ASSERT (FALSE); > + break; > + } > + } else { > + switch (Size) { > + case 1: > + if (Read) { > + *(UINT8 *) Buffer = MmioRead8 ((UINTN) Address); > + } else { > + MmioWrite8 ((UINTN) Address, *(UINT8 *) Buffer); > + } > + break; > + case 2: > + if (Read) { > + *(UINT16 *) Buffer = MmioRead16 ((UINTN) Address); > + } else { > + MmioWrite16 ((UINTN) Address, *(UINT16 *) Buffer); > + } > + break; > + case 4: > + if (Read) { > + *(UINT32 *) Buffer = MmioRead32 ((UINTN) Address); > + } else { > + MmioWrite32 ((UINTN) Address, *(UINT32 *) Buffer); > + } > + break; > + case 8: > + if (Read) { > + *(UINT64 *) Buffer = MmioRead64 ((UINTN) Address); > + } else { > + MmioWrite64 ((UINTN) Address, *(UINT64 *) Buffer); > + } > + break; > + default: > + ASSERT (FALSE); > + break; > + } > + } > + } > + } > } > > /** > - Convert a string to it's hex data. > + Find the CpuIo instance and PciRootBridgeIo instance in the platform. > + If there are multiple PciRootBridgeIo instances, the instance which manages > + the Address is returned. > > - @param[in] str The pointer to the string of hex data. > - @param[out] data The pointer to the buffer to fill. Valid upon a TRUE > return. > + @param[in] AccessType Access type. > + @param[in] Address Address to access. > + @param[out] CpuIo Return the CpuIo instance. > + @param[out] PciRootBridgeIo Return the proper PciRootBridgeIo instance. > > - @retval TRUE The conversion was successful. > - @retval FALSE The conversion failed. > + @retval TRUE There are PciRootBridgeIo instances in the platform. > + @retval FALSE There isn't PciRootBridgeIo instance in the platform. > **/ > BOOLEAN > -EFIAPI > -GetHex ( > - IN UINT16 *str, > - OUT UINT64 *data > +ShellMmLocateIoProtocol ( > + IN SHELL_MM_ACCESS_TYPE AccessType, > + IN UINT64 Address, > + OUT EFI_CPU_IO2_PROTOCOL **CpuIo, > + OUT EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL **PciRootBridgeIo > ) > { > - UINTN TempUint; > - CHAR16 TempChar; > - BOOLEAN Find; > + EFI_STATUS Status; > + UINTN Index; > + UINTN HandleCount; > + EFI_HANDLE *HandleBuffer; > + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *Io; > + UINT32 Segment; > + UINT8 Bus; > + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptors; > + > + Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **) > CpuIo); > + if (EFI_ERROR (Status)) { > + *CpuIo = NULL; > + } > + > + *PciRootBridgeIo = NULL; > + Status = gBS->LocateHandleBuffer ( > + ByProtocol, > + &gEfiPciRootBridgeIoProtocolGuid, > + NULL, > + &HandleCount, > + &HandleBuffer > + ); > + if (EFI_ERROR (Status) || (HandleCount == 0)) { > + return FALSE; > + } > + > + if ((AccessType == ShellMmPci) || (AccessType == ShellMmPciExpress)) { > + ShellMmDecodePciAddress ((BOOLEAN) (AccessType == ShellMmPci), Address, > &Segment, &Bus, NULL, NULL, NULL); > + } > > - Find = FALSE; > // > - // convert hex digits > + // Find the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL of the specified segment & bus > number > // > - TempUint = 0; > - TempChar = *(str++); > - while (TempChar != CHAR_NULL) { > - if (TempChar >= 'a' && TempChar <= 'f') { > - TempChar -= 'a' - 'A'; > - } > - > - if (TempChar == ' ') { > - break; > + for (Index = 0; (Index < HandleCount) && (*PciRootBridgeIo == NULL); > Index++) { > + Status = gBS->HandleProtocol ( > + HandleBuffer[Index], > + &gEfiPciRootBridgeIoProtocolGuid, > + (VOID *) &Io > + ); > + if (EFI_ERROR (Status)) { > + continue; > } > > - if ((TempChar >= '0' && TempChar <= '9') || (TempChar >= 'A' && TempChar > <= 'F')) { > - TempUint = (TempUint << 4) | (TempChar - (TempChar >= 'A' ? 'A' - > 10 : '0')); > - > - Find = TRUE; > - } else { > - return FALSE; > + if ((((AccessType == ShellMmPci) || (AccessType == ShellMmPciExpress)) > && (Io->SegmentNumber == Segment)) || > + ((AccessType == ShellMmIo) || (AccessType == ShellMmMemoryMappedIo)) > + ) { > + Status = Io->Configuration (Io, (VOID **) &Descriptors); > + if (!EFI_ERROR (Status)) { > + while (Descriptors->Desc != ACPI_END_TAG_DESCRIPTOR) { > + // > + // Compare the segment and bus range for PCI/PCIE access > + // > + if ((Descriptors->ResType == ACPI_ADDRESS_SPACE_TYPE_BUS) && > + ((AccessType == ShellMmPci) || (AccessType == > ShellMmPciExpress)) && > + ((Bus >= Descriptors->AddrRangeMin) && (Bus <= > Descriptors->AddrRangeMax)) > + ) { > + *PciRootBridgeIo = Io; > + break; > + > + // > + // Compare the address range for MMIO/IO access > + // > + } else if ((((Descriptors->ResType == ACPI_ADDRESS_SPACE_TYPE_IO) > && (AccessType == ShellMmIo)) || > + ((Descriptors->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) > && (AccessType == ShellMmMemoryMappedIo)) > + ) && ((Address >= Descriptors->AddrRangeMin) && > (Address <= Descriptors->AddrRangeMax)) > + ) { > + *PciRootBridgeIo = Io; > + break; > + } > + Descriptors++; > + } > + } > } > - > - TempChar = *(str++); > + } > + if (HandleBuffer != NULL) { > + FreePool (HandleBuffer); > } > > - *data = TempUint; > - return Find; > -} > - > -/** > - Get the PCI-E Address from a PCI address format 0x0000ssbbddffrrr > - where ss is SEGMENT, bb is BUS, dd is DEVICE, ff is FUNCTION > - and rrr is REGISTER (extension format for PCI-E). > - > - @param[in] InputAddress PCI address format on input. > - @param[out]PciEAddress PCI-E address extention format. > -**/ > -VOID > -EFIAPI > -GetPciEAddressFromInputAddress ( > - IN UINT64 InputAddress, > - OUT UINT64 *PciEAddress > - ) > -{ > - *PciEAddress = RShiftU64(InputAddress & ~(UINT64) 0xFFF, 4); > - *PciEAddress += LShiftU64((UINT16) InputAddress & 0x0FFF, 32); > + return TRUE; > } > > /** > @@ -207,438 +396,248 @@ ShellCommandRunMm ( > IN EFI_SYSTEM_TABLE *SystemTable > ) > { > - EFI_STATUS Status; > - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *IoDev; > - UINT64 Address; > - UINT64 PciEAddress; > - UINT64 Value; > - UINT32 SegmentNumber; > - EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH Width; > - EFI_ACCESS_TYPE AccessType; > - UINT64 Buffer; > - UINTN Index; > - UINTN Size; > -// CHAR16 *ValueStr; > - BOOLEAN Complete; > - CHAR16 *InputStr; > - BOOLEAN Interactive; > - EFI_HANDLE *HandleBuffer; > - UINTN BufferSize; > - UINTN ItemValue; > - LIST_ENTRY *Package; > - CHAR16 *ProblemParam; > - SHELL_STATUS ShellStatus; > - CONST CHAR16 *Temp; > - > - Value = 0; > - Address = 0; > - PciEAddress = 0; > - IoDev = NULL; > - HandleBuffer = NULL; > - BufferSize = 0; > - SegmentNumber = 0; > - ShellStatus = SHELL_SUCCESS; > - InputStr = NULL; > + EFI_STATUS Status; > + EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRootBridgeIo; > + EFI_CPU_IO2_PROTOCOL *CpuIo; > + UINT64 Address; > + UINT64 Value; > + SHELL_MM_ACCESS_TYPE AccessType; > + UINT64 Buffer; > + UINTN Index; > + UINTN Size; > + BOOLEAN Complete; > + CHAR16 *InputStr; > + BOOLEAN Interactive; > + LIST_ENTRY *Package; > + CHAR16 *ProblemParam; > + SHELL_STATUS ShellStatus; > + CONST CHAR16 *Temp; > + BOOLEAN HasPciRootBridgeIo; > + > + Value = 0; > + Address = 0; > + ShellStatus = SHELL_SUCCESS; > + InputStr = NULL; > + Size = 1; > + AccessType = ShellMmMemory; > > // > // Parse arguments > // > - Width = EfiPciWidthUint8; > - Size = 1; > - AccessType = EfiMemory; > -// ValueStr = NULL; > - Interactive = TRUE; > - Package = NULL; > - > Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE); > - if (EFI_ERROR(Status)) { > + if (EFI_ERROR (Status)) { > if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), > gShellDebug1HiiHandle, L"mm", ProblemParam); > - FreePool(ProblemParam); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), > gShellDebug1HiiHandle, L"mm", ProblemParam); > + FreePool (ProblemParam); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } else { > - ASSERT(FALSE); > + ASSERT (FALSE); > } > } else { > - if (ShellCommandLineGetCount(Package) < 2) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), > gShellDebug1HiiHandle, L"mm"); > + if (ShellCommandLineGetCount (Package) < 2) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > - } else if (ShellCommandLineGetCount(Package) > 3) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > + } else if (ShellCommandLineGetCount (Package) > 3) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > - } else if (ShellCommandLineGetFlag(Package, L"-w") && > ShellCommandLineGetValue(Package, L"-w") == NULL) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), > gShellDebug1HiiHandle, L"mm", L"-w"); > + } else if (ShellCommandLineGetFlag (Package, L"-w") && > ShellCommandLineGetValue (Package, L"-w") == NULL) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), > gShellDebug1HiiHandle, L"mm", L"-w"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } else { > - if (ShellCommandLineGetFlag(Package, L"-mmio")) { > - AccessType = EFIMemoryMappedIo; > - if (ShellCommandLineGetFlag(Package, L"-mem") > - ||ShellCommandLineGetFlag(Package, L"-io") > - ||ShellCommandLineGetFlag(Package, L"-pci") > - ||ShellCommandLineGetFlag(Package, L"-pcie") > - ){ > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > + if (ShellCommandLineGetFlag (Package, L"-mmio")) { > + AccessType = ShellMmMemoryMappedIo; > + if (ShellCommandLineGetFlag (Package, L"-mem") > + || ShellCommandLineGetFlag (Package, L"-io") > + || ShellCommandLineGetFlag (Package, L"-pci") > + || ShellCommandLineGetFlag (Package, L"-pcie") > + ) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > - } else if (ShellCommandLineGetFlag(Package, L"-mem")) { > - AccessType = EfiMemory; > - if (ShellCommandLineGetFlag(Package, L"-io") > - ||ShellCommandLineGetFlag(Package, L"-pci") > - ||ShellCommandLineGetFlag(Package, L"-pcie") > - ){ > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > + } else if (ShellCommandLineGetFlag (Package, L"-mem")) { > + AccessType = ShellMmMemory; > + if (ShellCommandLineGetFlag (Package, L"-io") > + || ShellCommandLineGetFlag (Package, L"-pci") > + || ShellCommandLineGetFlag (Package, L"-pcie") > + ) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > - } else if (ShellCommandLineGetFlag(Package, L"-io")) { > - AccessType = EfiIo; > - if (ShellCommandLineGetFlag(Package, L"-pci") > - ||ShellCommandLineGetFlag(Package, L"-pcie") > - ){ > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > + } else if (ShellCommandLineGetFlag (Package, L"-io")) { > + AccessType = ShellMmIo; > + if (ShellCommandLineGetFlag (Package, L"-pci") > + || ShellCommandLineGetFlag (Package, L"-pcie") > + ) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > - } else if (ShellCommandLineGetFlag(Package, L"-pci")) { > - AccessType = EfiPciConfig; > - if (ShellCommandLineGetFlag(Package, L"-pcie") > - ){ > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > + } else if (ShellCommandLineGetFlag (Package, L"-pci")) { > + AccessType = ShellMmPci; > + if (ShellCommandLineGetFlag (Package, L"-pcie") > + ) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > - } else if (ShellCommandLineGetFlag(Package, L"-pcie")) { > - AccessType = EfiPciEConfig; > + } else if (ShellCommandLineGetFlag (Package, L"-pcie")) { > + AccessType = ShellMmPciExpress; > } > } > > // > // Non interactive for a script file or for the specific parameter > // > - if (gEfiShellProtocol->BatchIsActive() || ShellCommandLineGetFlag > (Package, L"-n")) { > + Interactive = TRUE; > + if (gEfiShellProtocol->BatchIsActive () || ShellCommandLineGetFlag > (Package, L"-n")) { > Interactive = FALSE; > } > > - Temp = ShellCommandLineGetValue(Package, L"-w"); > + Temp = ShellCommandLineGetValue (Package, L"-w"); > if (Temp != NULL) { > - ItemValue = ShellStrToUintn (Temp); > - > - switch (ItemValue) { > - case 1: > - Width = EfiPciWidthUint8; > - Size = 1; > - break; > - > - case 2: > - Width = EfiPciWidthUint16; > - Size = 2; > - break; > - > - case 4: > - Width = EfiPciWidthUint32; > - Size = 4; > - break; > - > - case 8: > - Width = EfiPciWidthUint64; > - Size = 8; > - break; > - > - default: > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), > gShellDebug1HiiHandle, L"mm", Temp, L"-w"); > - ShellStatus = SHELL_INVALID_PARAMETER; > - goto Done; > - } > + Size = ShellStrToUintn (Temp); > } > - > - Temp = ShellCommandLineGetRawValue(Package, 1); > - if (!ShellIsHexOrDecimalNumber(Temp, TRUE, FALSE) || > EFI_ERROR(ShellConvertStringToUint64(Temp, (UINT64*)&Address, TRUE, > FALSE))) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), > gShellDebug1HiiHandle, L"mm", Temp); > + if ((Size != 1) && (Size != 2) && (Size != 4) && (Size != 8)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), > gShellDebug1HiiHandle, L"mm", Temp, L"-w"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > > - Temp = ShellCommandLineGetRawValue(Package, 2); > - if (Temp != NULL) { > - // > - // Per spec if value is specified, then -n is assumed. > - // > - Interactive = FALSE; > - > - if (!ShellIsHexOrDecimalNumber(Temp, TRUE, FALSE) || > EFI_ERROR(ShellConvertStringToUint64(Temp, &Value, TRUE, FALSE))) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), > gShellDebug1HiiHandle, L"mm", Temp); > - ShellStatus = SHELL_INVALID_PARAMETER; > - goto Done; > - } > - switch (Size) { > - case 1: > - if (Value > 0xFF) { > - ShellStatus = SHELL_INVALID_PARAMETER; > - } > - break; > - > - case 2: > - if (Value > 0xFFFF) { > - ShellStatus = SHELL_INVALID_PARAMETER; > - } > - break; > - > - case 4: > - if (Value > 0xFFFFFFFF) { > - ShellStatus = SHELL_INVALID_PARAMETER; > - } > - break; > - > - default: > - break; > - } > - > - if (ShellStatus != SHELL_SUCCESS) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), > gShellDebug1HiiHandle, L"mm", Temp); > - ShellStatus = SHELL_INVALID_PARAMETER; > - goto Done; > - } > + Temp = ShellCommandLineGetRawValue (Package, 1); > + Status = ShellConvertStringToUint64 (Temp, &Address, TRUE, FALSE); > + if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), > gShellDebug1HiiHandle, L"mm", Temp); > + ShellStatus = SHELL_INVALID_PARAMETER; > + goto Done; > } > > if ((Address & (Size - 1)) != 0) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_NOT_ALIGNED), > gShellDebug1HiiHandle, L"mm", Address); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_NOT_ALIGNED), > gShellDebug1HiiHandle, L"mm", Address); > + ShellStatus = SHELL_INVALID_PARAMETER; > + goto Done; > + } > + > + if ((AccessType == ShellMmIo) && (Address + Size > MAX_UINT16 + 1)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_IO_ADDRESS_RANGE), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > + > // > - // locate DeviceIO protocol interface > + // locate IO protocol interface > // > - if (AccessType != EfiMemory) { > - Status = gBS->LocateHandleBuffer ( > - ByProtocol, > - &gEfiPciRootBridgeIoProtocolGuid, > - NULL, > - &BufferSize, > - &HandleBuffer > - ); > - if (EFI_ERROR (Status)) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PCIRBIO_NF), > gShellDebug1HiiHandle, L"mm"); > + HasPciRootBridgeIo = ShellMmLocateIoProtocol (AccessType, Address, > &CpuIo, &PciRootBridgeIo); > + if ((AccessType == ShellMmPci) || (AccessType == ShellMmPciExpress)) { > + if (!HasPciRootBridgeIo) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PCIRBIO_NF), > gShellDebug1HiiHandle, L"mm"); > ShellStatus = SHELL_NOT_FOUND; > goto Done; > } > - // > - // In the case of PCI or PCIE > - // Get segment number and mask the segment bits in Address > - // > - if (AccessType == EfiPciEConfig) { > - SegmentNumber = (UINT32) RShiftU64 (Address, 36) & 0xff; > - Address &= 0xfffffffffULL; > - } else { > - if (AccessType == EfiPciConfig) { > - SegmentNumber = (UINT32) RShiftU64 (Address, 32) & 0xff; > - Address &= 0xffffffff; > - } > - } > - // > - // Find the EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL of the specified segment > number > - // > - for (Index = 0; Index < BufferSize; Index++) { > - Status = gBS->HandleProtocol ( > - HandleBuffer[Index], > - &gEfiPciRootBridgeIoProtocolGuid, > - (VOID *) &IoDev > - ); > - if (EFI_ERROR (Status)) { > - continue; > - } > - if (IoDev->SegmentNumber != SegmentNumber) { > - IoDev = NULL; > - } > - } > - if (IoDev == NULL) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN > (STR_MM_SEGMENT_NOT_FOUND), gShellDebug1HiiHandle, L"mm", > SegmentNumber); > + if (PciRootBridgeIo == NULL) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_MM_PCIE_ADDRESS_RANGE), gShellDebug1HiiHandle, L"mm", Address); > ShellStatus = SHELL_INVALID_PARAMETER; > goto Done; > } > } > > - if (AccessType == EfiIo && Address + Size > 0x10000) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS_RANGE), > gShellDebug1HiiHandle, L"mm"); > - ShellStatus = SHELL_INVALID_PARAMETER; > - goto Done; > - } > - > - if (AccessType == EfiPciEConfig) { > - GetPciEAddressFromInputAddress (Address, &PciEAddress); > - } > - > // > - // Set value > + // Mode 1: Directly set a value > // > - if (ShellCommandLineGetRawValue(Package, 2) != NULL) { > - if (AccessType == EFIMemoryMappedIo) { > - IoDev->Mem.Write (IoDev, Width, Address, 1, &Value); > - } else if (AccessType == EfiIo) { > - IoDev->Io.Write (IoDev, Width, Address, 1, &Value); > - } else if (AccessType == EfiPciConfig) { > - IoDev->Pci.Write (IoDev, Width, Address, 1, &Value); > - } else if (AccessType == EfiPciEConfig) { > - IoDev->Pci.Write (IoDev, Width, PciEAddress, 1, &Value); > - } else { > - WriteMem (Width, Address, 1, &Value); > + Temp = ShellCommandLineGetRawValue (Package, 2); > + if (Temp != NULL) { > + Status = ShellConvertStringToUint64 (Temp, &Value, TRUE, FALSE); > + if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), > gShellDebug1HiiHandle, L"mm", Temp); > + ShellStatus = SHELL_INVALID_PARAMETER; > + goto Done; > + } > + > + if (Value > mShellMmMaxNumber[Size]) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), > gShellDebug1HiiHandle, L"mm", Temp); > + ShellStatus = SHELL_INVALID_PARAMETER; > + goto Done; > } > > - ASSERT(ShellStatus == SHELL_SUCCESS); > + ShellMmAccess (AccessType, PciRootBridgeIo, CpuIo, FALSE, Address, > Size, &Value); > goto Done; > } > > - > // > - // non-interactive mode > + // Mode 2: Directly show a value > // > if (!Interactive) { > - Buffer = 0; > - if (AccessType == EFIMemoryMappedIo) { > - if (!gEfiShellProtocol->BatchIsActive()) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MMIO), > gShellDebug1HiiHandle); > - } > - IoDev->Mem.Read (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiIo) { > - if (!gEfiShellProtocol->BatchIsActive()) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_IO), > gShellDebug1HiiHandle); > - } > - IoDev->Io.Read (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiPciConfig) { > - if (!gEfiShellProtocol->BatchIsActive()) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCI), > gShellDebug1HiiHandle); > - } > - IoDev->Pci.Read (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiPciEConfig) { > - if (!gEfiShellProtocol->BatchIsActive()) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCIE), > gShellDebug1HiiHandle); > - } > - IoDev->Pci.Read (IoDev, Width, PciEAddress, 1, &Buffer); > - } else { > - if (!gEfiShellProtocol->BatchIsActive()) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MEM), > gShellDebug1HiiHandle); > - } > - ReadMem (Width, Address, 1, &Buffer); > - } > - if (!gEfiShellProtocol->BatchIsActive()) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), > gShellDebug1HiiHandle, Address); > - } > - if (Size == 1) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), > gShellDebug1HiiHandle, (UINTN)Buffer); > - } else if (Size == 2) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF4), > gShellDebug1HiiHandle, (UINTN)Buffer); > - } else if (Size == 4) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF8), > gShellDebug1HiiHandle, (UINTN)Buffer); > - } else if (Size == 8) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF16), > gShellDebug1HiiHandle, Buffer); > + if (!gEfiShellProtocol->BatchIsActive ()) { > + ShellPrintHiiEx (-1, -1, NULL, mShellMmAccessTypeStr[AccessType], > gShellDebug1HiiHandle); > } > + ShellMmAccess (AccessType, PciRootBridgeIo, CpuIo, TRUE, Address, > Size, &Buffer); > > - ShellPrintEx(-1, -1, L"\r\n"); > - > - ASSERT(ShellStatus == SHELL_SUCCESS); > + if (!gEfiShellProtocol->BatchIsActive ()) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), > gShellDebug1HiiHandle, Address); > + } > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_BUF), > gShellDebug1HiiHandle, Size * 2, Buffer & > mShellMmMaxNumber[Size]); > + ShellPrintEx (-1, -1, L"\r\n"); > goto Done; > } > + > // > - // interactive mode > + // Mode 3: Show or set values in interactive mode > // > Complete = FALSE; > do { > - if (AccessType == EfiIo && Address + Size > 0x10000) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS_RANGE2), > gShellDebug1HiiHandle, L"mm"); > + if ((AccessType == ShellMmIo) && (Address + Size > MAX_UINT16 + 1)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS_RANGE2), > gShellDebug1HiiHandle, L"mm"); > break; > } > > - Buffer = 0; > - if (AccessType == EFIMemoryMappedIo) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MMIO), > gShellDebug1HiiHandle); > - IoDev->Mem.Read (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiIo) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_IO), > gShellDebug1HiiHandle); > - IoDev->Io.Read (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiPciConfig) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCI), > gShellDebug1HiiHandle); > - IoDev->Pci.Read (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiPciEConfig) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_PCIE), > gShellDebug1HiiHandle); > - IoDev->Pci.Read (IoDev, Width, PciEAddress, 1, &Buffer); > - } else { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_MEM), > gShellDebug1HiiHandle); > - ReadMem (Width, Address, 1, &Buffer); > - } > - > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), > gShellDebug1HiiHandle, Address); > - > - if (Size == 1) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF2), > gShellDebug1HiiHandle, (UINTN)Buffer); > - } else if (Size == 2) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF4), > gShellDebug1HiiHandle, (UINTN)Buffer); > - } else if (Size == 4) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF8), > gShellDebug1HiiHandle, (UINTN)Buffer); > - } else if (Size == 8) { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_BUF16), > gShellDebug1HiiHandle, Buffer); > - } > - ShellPrintEx(-1, -1, L" > "); > + ShellMmAccess (AccessType, PciRootBridgeIo, CpuIo, TRUE, Address, > Size, &Buffer); > + ShellPrintHiiEx (-1, -1, NULL, mShellMmAccessTypeStr[AccessType], > gShellDebug1HiiHandle); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_ADDRESS), > gShellDebug1HiiHandle, Address); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_BUF), > gShellDebug1HiiHandle, Size * 2, Buffer & > mShellMmMaxNumber[Size]); > + ShellPrintEx (-1, -1, L" > "); > // > // wait user input to modify > // > if (InputStr != NULL) { > - FreePool(InputStr); > + FreePool (InputStr); > InputStr = NULL; > } > - ShellPromptForResponse(ShellPromptResponseTypeFreeform, NULL, > (VOID**)&InputStr); > + ShellPromptForResponse (ShellPromptResponseTypeFreeform, NULL, > (VOID**) &InputStr); > > - // > - // skip space characters > - // > - for (Index = 0; InputStr != NULL && InputStr[Index] == ' '; Index++); > - > - // > - // parse input string > - // > - if (InputStr != NULL && (InputStr[Index] == '.' || InputStr[Index] == > 'q' || InputStr[Index] == 'Q')) { > - Complete = TRUE; > - } else if (InputStr == NULL || InputStr[Index] == CHAR_NULL) { > + if (InputStr != NULL) { > // > - // Continue to next address > + // skip space characters > // > - } else if (GetHex (InputStr + Index, &Buffer) && Buffer <= > MaxNum[Width]) { > - if (AccessType == EFIMemoryMappedIo) { > - IoDev->Mem.Write (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiIo) { > - IoDev->Io.Write (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiPciConfig) { > - IoDev->Pci.Write (IoDev, Width, Address, 1, &Buffer); > - } else if (AccessType == EfiPciEConfig) { > - IoDev->Pci.Write (IoDev, Width, PciEAddress, 1, &Buffer); > + for (Index = 0; InputStr[Index] == ' '; Index++); > + } > + > + if ((InputStr != NULL) && (InputStr[Index] != CHAR_NULL)) { > + if ((InputStr[Index] == '.') || (InputStr[Index] == 'q') || > (InputStr[Index] == 'Q')) { > + Complete = TRUE; > + } else if (!EFI_ERROR (ShellConvertStringToUint64 (InputStr + Index, > &Buffer, TRUE, TRUE)) && > + (Buffer <= mShellMmMaxNumber[Size]) > + ) { > + ShellMmAccess (AccessType, PciRootBridgeIo, CpuIo, FALSE, Address, > Size, &Buffer); > } else { > - WriteMem (Width, Address, 1, &Buffer); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MM_ERROR), > gShellDebug1HiiHandle, L"mm"); > + continue; > } > - } else { > - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MM_ERROR), > gShellDebug1HiiHandle, L"mm"); > - continue; > - // PrintToken (STRING_TOKEN (STR_IOMOD_ERROR), HiiHandle); > } > > Address += Size; > - if (AccessType == EfiPciEConfig) { > - GetPciEAddressFromInputAddress (Address, &PciEAddress); > - } > - ShellPrintEx(-1, -1, L"\r\n"); > - // Print (L"\n"); > + ShellPrintEx (-1, -1, L"\r\n"); > } while (!Complete); > } > - ASSERT(ShellStatus == SHELL_SUCCESS); > -Done: > + ASSERT (ShellStatus == SHELL_SUCCESS); > > +Done: > if (InputStr != NULL) { > - FreePool(InputStr); > - } > - if (HandleBuffer != NULL) { > - FreePool (HandleBuffer); > + FreePool (InputStr); > } > if (Package != NULL) { > ShellCommandLineFreeVarList (Package); > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h > index d8755bf..ec15155 100644 > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.h > @@ -1,7 +1,7 @@ > /** @file > Main file for NULL named library for Profile1 shell command functions. > > - Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2010 - 2015, 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 > @@ -38,6 +38,7 @@ > #include <Protocol/DriverFamilyOverride.h> > #include <Protocol/DriverHealth.h> > #include <Protocol/SimplePointer.h> > +#include <Protocol/CpuIo2.h> > #include <Protocol/PciRootBridgeIo.h> > > #include <Library/BaseLib.h> > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf > index 55371eb..cfbf001 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf > @@ -17,7 +17,7 @@ > BASE_NAME = UefiShellDebug1CommandsLib > FILE_GUID = 90330D51-A99B-4cc8-A2EB-AE22542A3F45 > MODULE_TYPE = UEFI_APPLICATION > - VERSION_STRING = 1.0 > + VERSION_STRING = 1.1 > LIBRARY_CLASS = NULL|UEFI_APPLICATION UEFI_DRIVER > CONSTRUCTOR = UefiShellDebug1CommandsLibConstructor > DESTRUCTOR = UefiShellDebug1CommandsLibDestructor > @@ -106,6 +106,7 @@ > MemoryAllocationLib > BaseLib > BaseMemoryLib > + IoLib > DebugLib > ShellCommandLib > ShellLib > @@ -125,6 +126,7 @@ > gEfiPciRootBridgeIoProtocolGuid ## CONSUMES > gEfiBlockIoProtocolGuid ## CONSUMES > gEfiSimplePointerProtocolGuid ## CONSUMES > + gEfiCpuIo2ProtocolGuid ## CONSUMES > > [Guids] > gEfiGlobalVariableGuid ## SOMETIMES_CONSUMES ## GUID > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni > index > 2608cc39bd4efe2514a63209f673707313227f71..5f9910cfe6387f6864d899577b509e885278f54f > 100644 > GIT binary patch > delta 104 > zcmV-u0GI!;!wBBL2(V^Ulh9TM0Y#G$RUead2{M!FQ$h_O0CoUj0Bith0Av6lmjzq_ > zA(y6I0T7cg2^f=LR0ab{08f(<RU?xK2r{#5RbT^?62n514p|5RDzkxFbpeyGUm%0V > KT(`zt0qVrzk0N{k > > delta 228 > zcmcb&pJT&ejtyxcyul2v4DJlRK+=yPWcorSM#;%(JVw(+jxh=_t1_facH|J9eomNC > zV{$?W+vJW&smVstc9S1O>TP}$YQ#MG(P4$j2JA|l1`HJpstg7UMw1gG)hF{svN4)W > z{-`Jql4AzSP3B*y4mJQJV*!(a>#~69Vm4$j1Io&R^l`(?1d45rk1S=JY``f2GK4h< > r=vc?e6IaVmULfPaUc`{fkjRiS{h%+S{N#dQndT2s+do7xzB>W{H_JjW > > diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc > index 33ee76c..7e07cfb 100644 > --- a/ShellPkg/ShellPkg.dsc > +++ b/ShellPkg/ShellPkg.dsc > @@ -49,6 +49,7 @@ > > > PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf > > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf > + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf > > [LibraryClasses.ARM] > # > -- > 1.9.5.msysgit.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
