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

18
MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
View File

@@ -1218,12 +1218,11 @@ DetermineDeviceAttribute (
return Status;
}
//
// Assume the PCI Root Bridge supports DAC and Bus Master.
// Assume the PCI Root Bridge supports DAC
//
PciIoDevice->Supports |= (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);
} else {
@@ -1234,16 +1233,9 @@ DetermineDeviceAttribute (
//
Command = EFI_PCI_COMMAND_IO_SPACE |
EFI_PCI_COMMAND_MEMORY_SPACE |
EFI_PCI_COMMAND_BUS_MASTER |
EFI_PCI_COMMAND_VGA_PALETTE_SNOOP;
//
// Per PCI-to-PCI Bridge Architecture all PCI-to-PCI bridges are Bus Master capable.
// So only test the Bus Master capability for PCI devices.
//
if (!IS_PCI_BRIDGE(&PciIoDevice->Pci)) {
Command |= EFI_PCI_COMMAND_BUS_MASTER;
}
BridgeControl = EFI_PCI_BRIDGE_CONTROL_ISA | EFI_PCI_BRIDGE_CONTROL_VGA | EFI_PCI_BRIDGE_CONTROL_VGA_16;
//
@@ -1253,11 +1245,7 @@ DetermineDeviceAttribute (
//
// Set the supported attributes for specified PCI device
// Per PCI-to-PCI Bridge Architecture all PCI-to-PCI bridges are Bus Master capable.
//
if (IS_PCI_BRIDGE(&PciIoDevice->Pci)) {
Command |= EFI_PCI_COMMAND_BUS_MASTER;
}
PciSetDeviceAttribute (PciIoDevice, Command, BridgeControl, EFI_SET_SUPPORTS);
//