diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2015-12-10 04:18:35 +0000 |
|---|---|---|
| committer | niruiyu <niruiyu@Edk2> | 2015-12-10 04:18:35 +0000 |
| commit | 304316f430519b5a84cf7402d1721d22ba6f94b7 (patch) | |
| tree | b8845da1d73360dc3005aa0fdda1f77184706b1e /ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni | |
| parent | 25e34a2df4d17c8e3ba218179062a9a63f42a957 (diff) | |
| download | edk2-platforms-304316f430519b5a84cf7402d1721d22ba6f94b7.tar.xz | |
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.ni@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19181 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni')
| -rw-r--r-- | ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni index 3cbcbe24bf..4d9eb1f1db 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni @@ -145,21 +145,17 @@ #string STR_LOADPCIROM_START_FAIL #language en-US "%H%s%N: File '%B%s%N' Image %d unable to start.\r\n"
#string STR_MM_NOT_ALIGNED #language en-US "%H%s%N: Address parameter %016LX is not aligned.\r\n"
-#string STR_MM_SEGMENT_NOT_FOUND #language en-US "%H%s%N: Segment %d not found.\r\n"
-#string STR_MM_ADDRESS_RANGE #language en-US "%H%s%N: IO address out of range 0 - 0xFFFF\r\n"
+#string STR_MM_PCIE_ADDRESS_RANGE #language en-US "%H%s%N: Address parameter %016LX is not a valid PCI/PCIE address.\r\n"
+#string STR_MM_IO_ADDRESS_RANGE #language en-US "%H%s%N: IO address out of range 0 - 0xFFFF\r\n"
#string STR_MM_MMIO #language en-US "%HMMIO%N"
#string STR_MM_IO #language en-US "%HIO%N"
#string STR_MM_PCI #language en-US "%HPCI%N"
#string STR_MM_MEM #language en-US "%HMEM%N"
#string STR_MM_PCIE #language en-US "%HPCIE%N"
#string STR_MM_ADDRESS #language en-US " 0x%016lx : "
-#string STR_MM_BUF2 #language en-US "0x%02x"
-#string STR_MM_BUF4 #language en-US "0x%04x"
-#string STR_MM_BUF8 #language en-US "0x%08x"
-#string STR_MM_BUF16 #language en-US "0x%016lx"
+#string STR_MM_BUF #language en-US "0x%0*lx"
#string STR_MM_ADDRESS_RANGE2 #language en-US "%H%s%N: IO address out of range\r\n"
#string STR_MM_ERROR #language en-US "%H%s%N: Input had incorrect format\r\n"
-#string STR_MM_READ_ERROR #language en-US "%H%s%N: Unable to read memory.\r\n"
#string STR_SETVAR_PRINT #language en-US "%g - %s - %04x Bytes\r\n"
#string STR_SETVAR_ERROR_SET #language en-US "%H%s%N: Unable to set - %H%g%N - %H%s%N\r\n"
|