MdeModulePkg/AtaAtapiPassThru: Revert patch to disable Bus Master
authorRuiyu Ni <ruiyu.ni@intel.com>
Mon, 27 Nov 2017 01:13:51 +0000 (09:13 +0800)
committerRuiyu Ni <ruiyu.ni@intel.com>
Wed, 29 Nov 2017 01:02:46 +0000 (09:02 +0800)
This patch caused Windows 10 S4 resume failure.
Considering the similar changes are reverted from PciBus driver,
revert the patch from AtaAtapiPassThru as well.

Revert "MdeModulePkg/AtaAtapiPassThru: disable only BM-DMA at
ExitBootServices()"
This reverts commit 76fd5a660d704538a1b14a58d03a4eef9682b01c.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h

index e10e0d4..09064dd 100644 (file)
@@ -480,7 +480,8 @@ InitializeAtaAtapiPassThru (
 }\r
 \r
 /**\r
-  Disable Bus Master DMA on the device when exiting the boot services.\r
+  Disable the device (especially Bus Master DMA) when exiting the boot\r
+  services.\r
 \r
   @param[in] Event    Event for which this notification function is being\r
                       called.\r
@@ -505,7 +506,7 @@ AtaPassThruExitBootServices (
   PciIo->Attributes (\r
            PciIo,\r
            EfiPciIoAttributeOperationDisable,\r
-           Instance->EnabledPciAttributes & EFI_PCI_IO_ATTRIBUTE_BUS_MASTER,\r
+           Instance->EnabledPciAttributes,\r
            NULL\r
            );\r
 }\r
index 92c5bf2..8d6eac7 100644 (file)
@@ -123,7 +123,8 @@ typedef struct {
   LIST_ENTRY                        NonBlockingTaskList;\r
 \r
   //\r
-  // For disabling Bus Master DMA on the device at ExitBootServices().\r
+  // For disabling the device (especially Bus Master DMA) at\r
+  // ExitBootServices().\r
   //\r
   EFI_EVENT                         ExitBootEvent;\r
 } ATA_ATAPI_PASS_THRU_INSTANCE;\r