1. CoreOpenImageFile(): FilePath should be IN OUT.

2. Use offset address to build device path instead of absolute address.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4294 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
index 99c34d5bf51f0ea6571a5abf6149a101134f1247..c3f31bed97f5dcaa09aa41d4a47a5045e0303ae4 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciOptionRomSupport.c
@@ -1,13 +1,13 @@
 /**@file\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Module global for a template of the PCI option ROM Image Device Path Node\r
 //\r
 MEMMAP_DEVICE_PATH  mPciOptionRomImageDevicePathNodeTemplate = {\r
-  {                 \r
+  {\r
     HARDWARE_DEVICE_PATH,\r
     HW_MEMMAP_DP,\r
     sizeof (MEMMAP_DEVICE_PATH)\r
@@ -133,7 +133,7 @@ LoadOpRomImage (
 /*++\r
 \r
 Routine Description:\r
- \r
+\r
     Load option rom image for specified PCI device\r
 \r
 Arguments:\r
@@ -265,7 +265,7 @@ Returns:
       gBS->FreePool (RomPcir);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
-    \r
+\r
     //\r
     // Copy Rom image into memory\r
     //\r
@@ -337,7 +337,7 @@ Returns:
     for (Offset = 0x10; Offset <= 0x24; Offset += sizeof (UINT32)) {\r
       PciIoWrite (PciIo, EfiPciIoWidthUint32, Offset, 1, &gAllZero);\r
     }\r
-    \r
+\r
     //\r
     // set the Rom base address: now is hardcode\r
     // enable its decoder\r
@@ -362,7 +362,7 @@ Returns:
     PciEnableCommandRegister(PciDevice, EFI_PCI_COMMAND_MEMORY_SPACE);\r
 \r
   } else {\r
-    \r
+\r
     //\r
     // disable command register decode to memory\r
     //\r
@@ -400,14 +400,14 @@ ProcessOpRomImage (
 Routine Description:\r
 \r
   Process the oprom image.\r
-  \r
+\r
 Arguments:\r
   PciDevice       A pointer to a pci device.\r
 \r
 Returns:\r
 \r
   EFI Status.\r
-  \r
+\r
 --*/\r
 {\r
   UINT8                         Indicator;\r
@@ -457,7 +457,7 @@ Returns:
     ImageSize   = (UINT32) (Pcir->ImageLength * 512);\r
     Indicator   = Pcir->Indicator;\r
 \r
-    if ((Pcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) && \r
+    if ((Pcir->CodeType == PCI_CODE_TYPE_EFI_IMAGE) &&\r
         (EfiRomHeader->EfiSignature == EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE)) {\r
 \r
       if ((EfiRomHeader->EfiSubsystem == EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER)  ||\r
@@ -520,11 +520,11 @@ Returns:
         }\r
 \r
         if (!SkipImage) {\r
-          //   \r
-          // Build full device path to the PCI Option ROM Image being loaded\r
           //\r
-          mPciOptionRomImageDevicePathNodeTemplate.StartingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)RomBarOffset;\r
-          mPciOptionRomImageDevicePathNodeTemplate.EndingAddress   = (EFI_PHYSICAL_ADDRESS)(UINTN)(RomBarOffset + ImageSize - 1);\r
+          // Build Memory Mapped device path node to record the image offset into the PCI Option ROM\r
+          //\r
+          mPciOptionRomImageDevicePathNodeTemplate.StartingAddress = (EFI_PHYSICAL_ADDRESS) (UINTN) (RomBarOffset - (UINT8 *) RomBar);\r
+          mPciOptionRomImageDevicePathNodeTemplate.EndingAddress   = (EFI_PHYSICAL_ADDRESS) (UINTN) (RomBarOffset + ImageSize - 1 - (UINT8 *) RomBar);\r
           PciOptionRomImageDevicePath = AppendDevicePathNode (PciDevice->DevicePath, (const EFI_DEVICE_PATH_PROTOCOL *)&mPciOptionRomImageDevicePathNodeTemplate);\r
           ASSERT (PciOptionRomImageDevicePath != NULL);\r
 \r

diff --git a/MdeModulePkg/Core/Dxe/Image.h b/MdeModulePkg/Core/Dxe/Image.h
index 8d57de011163d790446ed77240fcae694ece8410..13936a518eb618c229edd59d4097e78f64ed7ce7 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image.h
+++ b/MdeModulePkg/Core/Dxe/Image.h
@@ -100,7 +100,7 @@ CoreOpenImageFile (
   IN BOOLEAN                        BootPolicy,\r
   IN VOID                           *SourceBuffer   OPTIONAL,\r
   IN UINTN                          SourceSize,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *FilePath,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL   **FilePath,\r
   OUT EFI_HANDLE                    *DeviceHandle,\r
   IN IMAGE_FILE_HANDLE              *ImageFileHandle,\r
   OUT UINT32                        *AuthenticationStatus\r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 99170dca90d8d0ec10c4379b5c184faf137f3bcc..e38dfaed7b0669a941eb4d2565abc1ef0a0910f9 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -639,7 +639,7 @@ Returns:
              BootPolicy,\r
              SourceBuffer,\r
              SourceSize,\r
-             FilePath,\r
+             &FilePath,\r
              &DeviceHandle,\r
              &FHand,\r
              &AuthenticationStatus\r
@@ -679,6 +679,7 @@ Returns:
   //\r
   // Pull out just the file portion of the DevicePath for the LoadedImage FilePath\r
   //\r
+  FilePath = OriginalFilePath;\r
   Status = CoreHandleProtocol (DeviceHandle, &gEfiDevicePathProtocolGuid, (VOID **)&HandleFilePath);\r
   if (!EFI_ERROR (Status)) {\r
     FilePathSize = CoreDevicePathSize (HandleFilePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL);\r

diff --git a/MdeModulePkg/Core/Dxe/Image/ImageFile.c b/MdeModulePkg/Core/Dxe/Image/ImageFile.c
index 31b1443697f1caba8b1ca466633a1647abba8063..5d8293a7348ac0646adc6931b8e15caea177e925 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/ImageFile.c
+++ b/MdeModulePkg/Core/Dxe/Image/ImageFile.c
@@ -1,22 +1,22 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006 - 2007, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
-  \r
+\r
   ImageFile.c\r
 \r
 \r
 Abstract:\r
 \r
-  \r
+\r
 \r
 \r
 Revision History\r
@@ -30,7 +30,7 @@ CoreOpenImageFile (
   IN BOOLEAN                        BootPolicy,\r
   IN VOID                           *SourceBuffer   OPTIONAL,\r
   IN UINTN                          SourceSize,\r
-  IN EFI_DEVICE_PATH_PROTOCOL       *FilePath,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL   **FilePath,\r
   OUT EFI_HANDLE                    *DeviceHandle,\r
   IN IMAGE_FILE_HANDLE              *ImageFileHandle,\r
   OUT UINT32                        *AuthenticationStatus\r
@@ -52,16 +52,16 @@ Arguments:
   FilePath      - The specific file path from which the image is loaded\r
   DeviceHandle  - Pointer to the return device handle.\r
   ImageFileHandle      - Pointer to the image file handle.\r
-  AuthenticationStatus - Pointer to a caller-allocated UINT32 in which the authentication status is returned. \r
-    \r
+  AuthenticationStatus - Pointer to a caller-allocated UINT32 in which the authentication status is returned.\r
+\r
 Returns:\r
 \r
     EFI_SUCCESS     - Image file successfully opened.\r
-    \r
+\r
     EFI_LOAD_ERROR  - If the caller passed a copy of the file, and SourceSize is 0.\r
-    \r
+\r
     EFI_INVALID_PARAMETER   - File path is not valid.\r
-    \r
+\r
     EFI_NOT_FOUND   - File not found.\r
 \r
 --*/\r
@@ -95,7 +95,7 @@ Returns:
     ImageFileHandle->Source     = SourceBuffer;\r
     ImageFileHandle->SourceSize = SourceSize;\r
     *DeviceHandle     = NULL;\r
-    CoreLocateDevicePath (&gEfiDevicePathProtocolGuid, &FilePath, DeviceHandle);\r
+    CoreLocateDevicePath (&gEfiDevicePathProtocolGuid, FilePath, DeviceHandle);\r
     if (SourceSize > 0) {\r
       Status = EFI_SUCCESS;\r
     } else {\r
@@ -107,18 +107,18 @@ Returns:
   //\r
   // Make sure FilePath is valid\r
   //\r
-  if (FilePath == NULL) {\r
+  if (*FilePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   //\r
   // Check to see if it's in a Firmware Volume\r
   //\r
-  FwVolFilePathNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)FilePath;\r
+  FwVolFilePathNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) *FilePath;\r
   Status = CoreDevicePathToInterface (\r
-            &gEfiFirmwareVolume2ProtocolGuid, \r
-            (EFI_DEVICE_PATH_PROTOCOL **)&FwVolFilePathNode, \r
-            (VOID*)&FwVol, \r
+            &gEfiFirmwareVolume2ProtocolGuid,\r
+            (EFI_DEVICE_PATH_PROTOCOL **)&FwVolFilePathNode,\r
+            (VOID*)&FwVol,\r
             DeviceHandle\r
             );\r
   if (!EFI_ERROR (Status)) {\r
@@ -131,9 +131,9 @@ Returns:
       SectionType = EFI_SECTION_PE32;\r
       Pe32Buffer  = NULL;\r
       Status = FwVol->ReadSection (\r
-                        FwVol, \r
-                        NameGuid,  \r
-                        SectionType,   \r
+                        FwVol,\r
+                        NameGuid,\r
+                        SectionType,\r
                         0,\r
                         (VOID **)&Pe32Buffer,\r
                         &Pe32BufferSize,\r
@@ -149,8 +149,8 @@ Returns:
         }\r
         Pe32Buffer = NULL;\r
         Status = FwVol->ReadFile (\r
-                          FwVol, \r
-                          NameGuid, \r
+                          FwVol,\r
+                          NameGuid,\r
                           (VOID **)&Pe32Buffer,\r
                           &Pe32BufferSize,\r
                           &Type,\r
@@ -158,7 +158,7 @@ Returns:
                           AuthenticationStatus\r
                           );\r
       }\r
-            \r
+\r
       if (!EFI_ERROR (Status)) {\r
         //\r
         // One of the reads passed so we are done\r
@@ -174,11 +174,11 @@ Returns:
   //\r
   // Attempt to access the file via a file system interface\r
   //\r
-  FilePathNode = (FILEPATH_DEVICE_PATH *) FilePath;\r
+  FilePathNode = (FILEPATH_DEVICE_PATH *) *FilePath;\r
   Status = CoreDevicePathToInterface (\r
-            &gEfiSimpleFileSystemProtocolGuid, \r
-            (EFI_DEVICE_PATH_PROTOCOL **)&FilePathNode, \r
-            (VOID*)&Volume, \r
+            &gEfiSimpleFileSystemProtocolGuid,\r
+            (EFI_DEVICE_PATH_PROTOCOL **)&FilePathNode,\r
+            (VOID*)&Volume,\r
             DeviceHandle\r
             );\r
   if (!EFI_ERROR (Status)) {\r
@@ -187,7 +187,7 @@ Returns:
     //\r
     Status = Volume->OpenVolume (Volume, &FileHandle);\r
     if (!EFI_ERROR (Status)) {\r
-     \r
+\r
       //\r
       // Parse each MEDIA_FILEPATH_DP node. There may be more than one, since the\r
       //  directory information and filename can be seperate. The goal is to inch\r
@@ -239,7 +239,7 @@ Returns:
                                 FileHandle,\r
                                 &gEfiFileInfoGuid,\r
                                 &FileInfoSize,\r
-                                FileInfo                               \r
+                                FileInfo\r
                                 );\r
         }\r
         if (!EFI_ERROR (Status)) {\r
@@ -267,14 +267,14 @@ Returns:
         }\r
       }\r
     }\r
-  } \r
+  }\r
 \r
 \r
   //\r
   // Try LoadFile style\r
   //\r
 \r
-  TempFilePath = FilePath;\r
+  TempFilePath = *FilePath;\r
   Status = CoreDevicePathToInterface (\r
               &gEfiLoadFileProtocolGuid,\r
               &TempFilePath,\r
@@ -350,12 +350,12 @@ Routine Description:
 Arguments:\r
 \r
   UserHandle      - Image file handle\r
-  \r
+\r
   Offset          - Offset to the source file\r
-  \r
+\r
   ReadSize        - For input, pointer of size to read;\r
                     For output, pointer of size actually read.\r
-  \r
+\r
   Buffer          - Buffer to write into\r
 \r
 Returns:\r
@@ -376,7 +376,7 @@ Returns:
   EndPosition = Offset + *ReadSize;\r
   if (EndPosition > FHand->SourceSize) {\r
     *ReadSize = (UINT32)(FHand->SourceSize - Offset);\r
-  }  \r
+  }\r
   if (Offset >= FHand->SourceSize) {\r
       *ReadSize = 0;\r
   }\r
@@ -402,13 +402,13 @@ Routine Description:
 Arguments:\r
 \r
   Protocol      - The protocol to search for\r
-  \r
+\r
   FilePath      - The specified device path\r
-  \r
+\r
   Interface     - Interface of the protocol on the handle\r
-  \r
+\r
   Handle        - The handle to the device on the specified device path that supports the protocol.\r
-  \r
+\r
 Returns:\r
 \r
   Status code.\r
@@ -435,7 +435,7 @@ CoreGrowBuffer (
 Routine Description:\r
 \r
     Helper function called as part of the code needed\r
-    to allocate the proper sized buffer for various \r
+    to allocate the proper sized buffer for various\r
     EFI interfaces.\r
 \r
 Arguments:\r
@@ -445,10 +445,10 @@ Arguments:
     Buffer      - Current allocated buffer, or NULL\r
 \r
     BufferSize  - Current buffer size needed\r
-    \r
+\r
 Returns:\r
-    \r
-    TRUE - if the buffer was reallocated and the caller \r
+\r
+    TRUE - if the buffer was reallocated and the caller\r
     should try the API again.\r
 \r
     FALSE - buffer could not be allocated and the caller\r
@@ -473,7 +473,7 @@ Returns:
   //\r
   // If the status code is "buffer too small", resize the buffer\r
   //\r
-      \r
+\r
   if (*Status == EFI_BUFFER_TOO_SMALL) {\r
     if (*Buffer != NULL) {\r
       CoreFreePool (*Buffer);\r
@@ -482,9 +482,9 @@ Returns:
     *Buffer = CoreAllocateBootServicesPool (BufferSize);\r
     if (*Buffer != NULL) {\r
       TryAgain = TRUE;\r
-    } else {    \r
+    } else {\r
       *Status = EFI_OUT_OF_RESOURCES;\r
-    } \r
+    }\r
   }\r
 \r
   //\r