diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-11-20 11:03:41 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-11-22 18:00:48 +0800 |
| commit | a8035b908655afd59321173752b29970ae61601b (patch) | |
| tree | 96efc40ae2022757d5cbfc0d72d8efd80467a787 /MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | |
| parent | 8315563285719f09f13e69a408f34558fc41c822 (diff) | |
| download | edk2-a8035b908655afd59321173752b29970ae61601b.tar.gz edk2-a8035b908655afd59321173752b29970ae61601b.tar.bz2 edk2-a8035b908655afd59321173752b29970ae61601b.zip | |
MdeModulePkg/PciBus: Revert "Enable BM on P2P bridges on demand"
This reverts commit 5db417ed2522367290c365831f9d6628d31c346c.
"MdeModulePkg/PciBusDxe: Enable Bus Master on P2P bridges on demand"
We met some compatibility issues when doing Windows S4 resume.
Reverting the BME disabling patches to fix the S4 resume issue.
Signed-off-by: Ruiyu Ni <Ruiyu.ni@intel.com>
Signed-off-by: Michael Turner <michael.turner@microsoft.com>
Cc: Michael D Kinney <Michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Diffstat (limited to 'MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c')
| -rw-r--r-- | MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c index 659f480d71..cc7125e4fc 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c @@ -1348,8 +1348,7 @@ ModifyRootBridgeAttributes ( //
Attributes &= ~(UINT64)(EFI_PCI_IO_ATTRIBUTE_EMBEDDED_DEVICE |
EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM |
- EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE |
- EFI_PCI_IO_ATTRIBUTE_BUS_MASTER);
+ EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE);
//
// Record the new attribute of the Root Bridge
@@ -1727,11 +1726,12 @@ PciIoAttributes ( }
//
// The upstream bridge should be also set to revelant attribute
- // expect for IO and Mem
+ // expect for IO, Mem and BusMaster
//
UpStreamAttributes = Attributes &
(~(EFI_PCI_IO_ATTRIBUTE_IO |
- EFI_PCI_IO_ATTRIBUTE_MEMORY
+ EFI_PCI_IO_ATTRIBUTE_MEMORY |
+ EFI_PCI_IO_ATTRIBUTE_BUS_MASTER
)
);
UpStreamBridge = PciIoDevice->Parent;
|