mirror of https://github.com/acidanthera/audk.git
MdeModulePkg/PciBus: Revert "Enable BM on P2P bridges on demand"
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:
parent
8315563285
commit
a8035b9086
|
@ -1,7 +1,7 @@
|
|||
/** @file
|
||||
Supporting functions implementaion for PCI devices management.
|
||||
|
||||
Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
|
@ -711,12 +711,7 @@ StartPciDevicesOnBridge (
|
|||
0,
|
||||
&Supports
|
||||
);
|
||||
//
|
||||
// By default every bridge's IO and MMIO spaces are enabled.
|
||||
// Bridge's Bus Master will be enabled when any device behind it requests
|
||||
// to enable Bus Master.
|
||||
//
|
||||
Supports &= (UINT64) (EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY);
|
||||
Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
|
||||
PciIoDevice->PciIo.Attributes (
|
||||
&(PciIoDevice->PciIo),
|
||||
EfiPciIoAttributeOperationEnable,
|
||||
|
@ -768,12 +763,7 @@ StartPciDevicesOnBridge (
|
|||
0,
|
||||
&Supports
|
||||
);
|
||||
//
|
||||
// By default every bridge's IO and MMIO spaces are enabled.
|
||||
// Bridge's Bus Master will be enabled when any device behind it requests
|
||||
// to enable Bus Master.
|
||||
//
|
||||
Supports &= (UINT64) (EFI_PCI_IO_ATTRIBUTE_IO | EFI_PCI_IO_ATTRIBUTE_MEMORY);
|
||||
Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE;
|
||||
PciIoDevice->PciIo.Attributes (
|
||||
&(PciIoDevice->PciIo),
|
||||
EfiPciIoAttributeOperationEnable,
|
||||
|
|
|
@ -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);
|
||||
|
||||
//
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue