From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9BC2321C913BC for ; Sun, 19 Nov 2017 19:01:24 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Nov 2017 19:05:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,424,1505804400"; d="scan'208";a="3678640" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.15]) by fmsmga004.fm.intel.com with ESMTP; 19 Nov 2017 19:05:37 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Ruiyu Ni , Michael Turner , Michael D Kinney , Jiewen Yao Date: Mon, 20 Nov 2017 11:05:31 +0800 Message-Id: <20171120030532.7548-2-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.15.0.gvfs.1.preview.4 In-Reply-To: <20171120030532.7548-1-ruiyu.ni@intel.com> References: <20171120030532.7548-1-ruiyu.ni@intel.com> Subject: [PATCH 1/2] MdeModulePkg/PciBus: Revert "disable all BME when entering RT" X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2017 03:01:24 -0000 This reverts commit 050763db0730a0bb46235cec87e3716632dc532c. "MdeModulePkg/PciBus: Disable BME of all devices when entering RT" 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 Signed-off-by: Michael Turner Cc: Michael D Kinney Cc: Jiewen Yao --- MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h | 2 - MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf | 3 - MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c | 86 ----------------------- 3 files changed, 91 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h index 79b5b71082..55eb3a5a80 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -18,8 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include -#include - #include #include #include diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf index d5b8fab3ca..97608bfcf2 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf @@ -80,9 +80,6 @@ [LibraryClasses] DebugLib PeCoffLib -[Guids] - gEfiEventExitBootServicesGuid ## SOMETIMES_CONSUMES ## Event - [Protocols] gEfiPciHotPlugRequestProtocolGuid ## SOMETIMES_PRODUCES gEfiPciIoProtocolGuid ## BY_START diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c index 004f2a3b5b..97bb971a59 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c @@ -20,72 +20,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // LIST_ENTRY mPciDevicePool; -/** - Disable Bus Master Enable bit in all devices in the list. - - @param Devices A device list. -**/ -VOID -DisableBmeOnTree ( - IN LIST_ENTRY *Devices - ) -{ - LIST_ENTRY *Link; - PCI_IO_DEVICE *PciIoDevice; - UINT16 Command; - - for ( Link = GetFirstNode (Devices) - ; !IsNull (Devices, Link) - ; Link = GetNextNode (Devices, Link) - ) { - PciIoDevice = PCI_IO_DEVICE_FROM_LINK (Link); - // - // Turn off all children's Bus Master, if any - // - DisableBmeOnTree (&PciIoDevice->ChildList); - - // - // If this is a device that supports BME, disable BME on this device. - // - if ((PciIoDevice->Supports & EFI_PCI_IO_ATTRIBUTE_BUS_MASTER) != 0) { - PCI_READ_COMMAND_REGISTER(PciIoDevice, &Command); - if ((Command & EFI_PCI_COMMAND_BUS_MASTER) != 0) { - Command &= ~EFI_PCI_COMMAND_BUS_MASTER; - PCI_SET_COMMAND_REGISTER (PciIoDevice, Command); - DEBUG (( - DEBUG_INFO," %02x %02x %02x %04x\n", - PciIoDevice->BusNumber, PciIoDevice->DeviceNumber, PciIoDevice->FunctionNumber, - Command - )); - } - } - } -} - -/** - Exit Boot Services Event notification handler. - - Disable Bus Master on any that were enabled during BDS. - - @param[in] Event Event whose notification function is being invoked. - @param[in] Context Pointer to the notification function's context. - -**/ -VOID -EFIAPI -OnExitBootServices ( - IN EFI_EVENT Event, - IN VOID *Context - ) -{ - DEBUG (( - DEBUG_INFO, - "PciBus: Disable Bus Master of all devices...\n" - " Bus# Device# Function# NewCommand\n" - )); - DisableBmeOnTree(&mPciDevicePool); -} - /** Initialize the PCI devices pool. @@ -95,27 +29,7 @@ InitializePciDevicePool ( VOID ) { - EFI_EVENT ExitBootServicesEvent; - EFI_STATUS Status; - InitializeListHead (&mPciDevicePool); - - // - // DisableBME on ExitBootServices should be synchonized with any IOMMU ExitBootServices routine. - // DisableBME should be run before the IOMMU protections are disabled. - // One way to do this is to ensure that the IOMMU ExitBootServices callback runs at TPL_CALLBACK. - // - Status = gBS->CreateEventEx ( - EVT_NOTIFY_SIGNAL, - TPL_NOTIFY, - OnExitBootServices, - NULL, - &gEfiEventExitBootServicesGuid, - &ExitBootServicesEvent - ); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "PciBus: Unable to hook ExitBootServices event - %r\n", Status)); - } } /** -- 2.15.0.gvfs.1.preview.4