sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 5db417ed25.
 "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>
This commit is contained in:
Ruiyu Ni
2017-11-20 11:03:41 +08:00
parent 8315563285
commit a8035b9086
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
View File

@@ -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;