MdeModulePkg/PciBus: Revert "Enable BM on P2P bridges on demand"

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciBusDxe / PciEnumeratorSupport.c

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index f73756a31ecd9dcf40b1011bc85d2083d814ca06..81171c82d9e21500ceaf25464d78d196904b02b2 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -1218,12 +1218,11 @@ DetermineDeviceAttribute (
       return Status;\r
     }\r
     //\r
-    // Assume the PCI Root Bridge supports DAC and Bus Master.\r
+    // Assume the PCI Root Bridge supports DAC\r
     //\r
     PciIoDevice->Supports |= (UINT64)(EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE |\r
                               EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM |\r
-                              EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE |\r
-                              EFI_PCI_IO_ATTRIBUTE_BUS_MASTER);\r
+                              EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE);\r
 \r
   } else {\r
 \r
@@ -1234,16 +1233,9 @@ DetermineDeviceAttribute (
     //\r
     Command = EFI_PCI_COMMAND_IO_SPACE     |\r
               EFI_PCI_COMMAND_MEMORY_SPACE |\r
+              EFI_PCI_COMMAND_BUS_MASTER   |\r
               EFI_PCI_COMMAND_VGA_PALETTE_SNOOP;\r
 \r
-    //\r
-    // Per PCI-to-PCI Bridge Architecture all PCI-to-PCI bridges are Bus Master capable.\r
-    // So only test the Bus Master capability for PCI devices.\r
-    //\r
-    if (!IS_PCI_BRIDGE(&PciIoDevice->Pci)) {\r
-      Command |= EFI_PCI_COMMAND_BUS_MASTER;\r
-    }\r
-\r
     BridgeControl = EFI_PCI_BRIDGE_CONTROL_ISA | EFI_PCI_BRIDGE_CONTROL_VGA | EFI_PCI_BRIDGE_CONTROL_VGA_16;\r
 \r
     //\r
@@ -1253,11 +1245,7 @@ DetermineDeviceAttribute (
 \r
     //\r
     // Set the supported attributes for specified PCI device\r
-    // Per PCI-to-PCI Bridge Architecture all PCI-to-PCI bridges are Bus Master capable.\r
     //\r
-    if (IS_PCI_BRIDGE(&PciIoDevice->Pci)) {\r
-      Command |= EFI_PCI_COMMAND_BUS_MASTER;\r
-    }\r
     PciSetDeviceAttribute (PciIoDevice, Command, BridgeControl, EFI_SET_SUPPORTS);\r
 \r
     //\r