MdeModulePkg: remove PE/COFF header workaround for ELILO on IPF

Now that Itanium support has been dropped, we can remove the various
occurrences of the ELILO on Itanium PE/COFF header workaround.

Link: https://bugzilla.tianocore.org/show_bug.cgi?id=816
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

5 files changed, 5 insertions, 108 deletions

diff --git a/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c b/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
index 83ed43a16e..ff1940431c 100644
--- a/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
+++ b/MdeModulePkg/Core/Dxe/Mem/MemoryProfileRecord.c
@@ -255,35 +255,6 @@ GetMemoryProfileContext (
 }

 

 /**

-  Retrieves the magic value from the PE/COFF header.

-

-  @param Hdr    The buffer in which to return the PE32, PE32+, or TE header.

-

-  @return EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC - Image is PE32

-  @return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC - Image is PE32+

-

-**/

-UINT16

-InternalPeCoffGetPeHeaderMagicValue (

-  IN  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr

-  )

-{

-  //

-  // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value

-  //       in the PE/COFF Header.  If the MachineType is Itanium(IA64) and the

-  //       Magic value in the OptionalHeader is  EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC

-  //       then override the returned value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC

-  //

-  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

-    return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-  }

-  //

-  // Return the magic value from the PC/COFF Optional Header

-  //

-  return Hdr.Pe32->OptionalHeader.Magic;

-}

-

-/**

   Retrieves and returns the Subsystem of a PE/COFF image that has been loaded into system memory.

   If Pe32Data is NULL, then ASSERT().

 

@@ -319,7 +290,7 @@ InternalPeCoffGetSubsystem (
   if (Hdr.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {

     return Hdr.Te->Subsystem;

   } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE)  {

-    Magic = InternalPeCoffGetPeHeaderMagicValue (Hdr);

+    Magic = Hdr.Pe32->OptionalHeader.Magic;

     if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

       return Hdr.Pe32->OptionalHeader.Subsystem;

     } else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
index 4cd219c88e..fa8f8fe91a 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
+++ b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
@@ -406,7 +406,6 @@ ProtectUefiImage (
   IMAGE_PROPERTIES_RECORD              *ImageRecord;

   CHAR8                                *PdbPointer;

   IMAGE_PROPERTIES_RECORD_CODE_SECTION *ImageRecordCodeSection;

-  UINT16                               Magic;

   BOOLEAN                              IsAligned;

   UINT32                               ProtectionPolicy;

 

@@ -466,21 +465,7 @@ ProtectUefiImage (
   //

   // Get SectionAlignment

   //

-  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

-    //

-    // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value

-    //       in the PE/COFF Header. If the MachineType is Itanium(IA64) and the

-    //       Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC

-    //       then override the magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC

-    //

-    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-  } else {

-    //

-    // Get the magic value from the PE/COFF Optional Header

-    //

-    Magic = Hdr.Pe32->OptionalHeader.Magic;

-  }

-  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

+  if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

     SectionAlignment  = Hdr.Pe32->OptionalHeader.SectionAlignment;

   } else {

     SectionAlignment  = Hdr.Pe32Plus->OptionalHeader.SectionAlignment;

diff --git a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c b/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
index a96d442fbc..05eb4f422b 100644
--- a/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
+++ b/MdeModulePkg/Core/Dxe/Misc/PropertiesTable.c
@@ -1076,7 +1076,6 @@ InsertImageRecord (
   IMAGE_PROPERTIES_RECORD              *ImageRecord;

   CHAR8                                *PdbPointer;

   IMAGE_PROPERTIES_RECORD_CODE_SECTION *ImageRecordCodeSection;

-  UINT16                               Magic;

 

   DEBUG ((EFI_D_VERBOSE, "InsertImageRecord - 0x%x\n", RuntimeImage));

   DEBUG ((EFI_D_VERBOSE, "InsertImageRecord - 0x%016lx - 0x%016lx\n", (EFI_PHYSICAL_ADDRESS)(UINTN)RuntimeImage->ImageBase, RuntimeImage->ImageSize));

@@ -1126,21 +1125,7 @@ InsertImageRecord (
   //

   // Get SectionAlignment

   //

-  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

-    //

-    // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value

-    //       in the PE/COFF Header. If the MachineType is Itanium(IA64) and the

-    //       Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC

-    //       then override the magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC

-    //

-    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-  } else {

-    //

-    // Get the magic value from the PE/COFF Optional Header

-    //

-    Magic = Hdr.Pe32->OptionalHeader.Magic;

-  }

-  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

+  if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

     SectionAlignment  = Hdr.Pe32->OptionalHeader.SectionAlignment;

   } else {

     SectionAlignment  = Hdr.Pe32Plus->OptionalHeader.SectionAlignment;

diff --git a/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c b/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c
index 1682d0f9e4..157beb1e67 100644
--- a/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c
+++ b/MdeModulePkg/Core/PiSmmCore/MemoryAttributesTable.c
@@ -1032,7 +1032,6 @@ SmmInsertImageRecord (
   IMAGE_PROPERTIES_RECORD              *ImageRecord;

   CHAR8                                *PdbPointer;

   IMAGE_PROPERTIES_RECORD_CODE_SECTION *ImageRecordCodeSection;

-  UINT16                               Magic;

 

   DEBUG ((DEBUG_VERBOSE, "SMM InsertImageRecord - 0x%x\n", DriverEntry));

   DEBUG ((DEBUG_VERBOSE, "SMM InsertImageRecord - 0x%016lx - 0x%08x\n", DriverEntry->ImageBuffer, DriverEntry->NumberOfPage));

@@ -1076,21 +1075,7 @@ SmmInsertImageRecord (
   //

   // Get SectionAlignment

   //

-  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

-    //

-    // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value

-    //       in the PE/COFF Header. If the MachineType is Itanium(IA64) and the

-    //       Magic value in the OptionalHeader is EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC

-    //       then override the magic value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC

-    //

-    Magic = EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-  } else {

-    //

-    // Get the magic value from the PE/COFF Optional Header

-    //

-    Magic = Hdr.Pe32->OptionalHeader.Magic;

-  }

-  if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

+  if (Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

     SectionAlignment  = Hdr.Pe32->OptionalHeader.SectionAlignment;

   } else {

     SectionAlignment  = Hdr.Pe32Plus->OptionalHeader.SectionAlignment;

diff --git a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c b/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
index b586afa794..e8d60c2d23 100644
--- a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
@@ -256,35 +256,6 @@ GetSmramProfileContext (
 }

 

 /**

-  Retrieves the magic value from the PE/COFF header.

-

-  @param Hdr    The buffer in which to return the PE32, PE32+, or TE header.

-

-  @return EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC - Image is PE32

-  @return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC - Image is PE32+

-

-**/

-UINT16

-InternalPeCoffGetPeHeaderMagicValue (

-  IN  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION  Hdr

-  )

-{

-  //

-  // NOTE: Some versions of Linux ELILO for Itanium have an incorrect magic value

-  //       in the PE/COFF Header.  If the MachineType is Itanium(IA64) and the

-  //       Magic value in the OptionalHeader is  EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC

-  //       then override the returned value to EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC

-  //

-  if (Hdr.Pe32->FileHeader.Machine == IMAGE_FILE_MACHINE_IA64 && Hdr.Pe32->OptionalHeader.Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

-    return EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC;

-  }

-  //

-  // Return the magic value from the PC/COFF Optional Header

-  //

-  return Hdr.Pe32->OptionalHeader.Magic;

-}

-

-/**

   Retrieves and returns the Subsystem of a PE/COFF image that has been loaded into system memory.

   If Pe32Data is NULL, then ASSERT().

 

@@ -320,7 +291,7 @@ InternalPeCoffGetSubsystem (
   if (Hdr.Te->Signature == EFI_TE_IMAGE_HEADER_SIGNATURE) {

     return Hdr.Te->Subsystem;

   } else if (Hdr.Pe32->Signature == EFI_IMAGE_NT_SIGNATURE)  {

-    Magic = InternalPeCoffGetPeHeaderMagicValue (Hdr);

+    Magic = Hdr.Pe32->OptionalHeader.Magic;

     if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {

       return Hdr.Pe32->OptionalHeader.Subsystem;

     } else if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {