MdeModulePkg/AtaAtapiPassThru: Revert patch to disable Bus Master

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>

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
index e10e0d4e65f6b2fb3af03b781adbd1851e622850..09064dda18b70753d6a100ad21e9855c90291e78 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c
@@ -480,7 +480,8 @@ InitializeAtaAtapiPassThru (
 }\r
 \r
 /**\r
 }\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
 \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
   PciIo->Attributes (\r
            PciIo,\r
            EfiPciIoAttributeOperationDisable,\r

-           Instance->EnabledPciAttributes & EFI_PCI_IO_ATTRIBUTE_BUS_MASTER,\r
+           Instance->EnabledPciAttributes,\r

            NULL\r
            );\r
 }\r
            NULL\r
            );\r
 }\r

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
index 92c5bf2001cdb30603fb703cf808806c6919d101..8d6eac706c0b7a4294d19b1a80e806ef0f07732e 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h
@@ -123,7 +123,8 @@ typedef struct {
   LIST_ENTRY                        NonBlockingTaskList;\r
 \r
   //\r
   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
   //\r
   EFI_EVENT                         ExitBootEvent;\r
 } ATA_ATAPI_PASS_THRU_INSTANCE;\r