Rollback the enhancement of Pcibus in r4844 for more investigation.

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 75e6859e0d58276ef990134412c499ff10696ef8..7d211eaaed80ca198b298ec8077b17a8abc92996 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -453,12 +453,6 @@ GatherPpbInfo (
     } else {\r
       PciIoDevice->Decodes |= EFI_BRIDGE_IO16_DECODE_SUPPORTED;\r
     }\r
-    //\r
-    // changed to support En1K for IO Bridge Device\r
-    //\r
-    if( (Value & 0x0c) == 0x0c ){\r
-      PciIoDevice->Decodes |= EFI_BRIDGE_IOEN1K_DECODE_SUPPORTED;\r
-    }\r
   }\r
 \r
   Status = BarExisted (\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
index 563f229c7f59af37191b1dc3efd02d70349b7b9b..9e094d1f8e90fcf842395fee064e35053ba3dc0e 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
@@ -593,13 +593,6 @@ CreateResourceNode (
   Node->PciDev        = PciDev;\r
   Node->Length        = Length;\r
   Node->Alignment     = Alignment;\r
-  if(((ResType == PciBarTypeIo16) || (ResType == PciBarTypeIo32)) && ( Alignment == 0x0FFF))\r
-  {\r
-    if((PciDev->Decodes & EFI_BRIDGE_IOEN1K_DECODE_SUPPORTED) == EFI_BRIDGE_IOEN1K_DECODE_SUPPORTED)\r
-      Node->Alignment = 0x3FF;\r
-    else\r
-      Node->Alignment = 0xFFF;\r
-  }\r
   Node->Bar           = Bar;\r
   Node->ResType       = ResType;\r
   Node->Reserved      = FALSE;\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h
index 9ce14e87e0f3ae26daafbfe3e80affa110a719aa..9db1dde553fd2b0473a6231805f96c88377385ff 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.h
@@ -110,7 +110,6 @@ typedef struct {
 #define EFI_BRIDGE_PMEM_MEM_COMBINE_SUPPORTED 0x0010\r
 #define EFI_BRIDGE_MEM64_DECODE_SUPPORTED     0x0020\r
 #define EFI_BRIDGE_MEM32_DECODE_SUPPORTED     0x0040\r
-#define EFI_BRIDGE_IOEN1K_DECODE_SUPPORTED    0x0080\r
 \r
 #define PCI_MAX_HOST_BRIDGE_NUM               0x0010\r
 //\r