From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 752F921D1E2C6 for ; Fri, 25 Aug 2017 00:40:51 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Aug 2017 00:43:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,424,1498546800"; d="scan'208";a="1210289588" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.2]) by fmsmga002.fm.intel.com with ESMTP; 25 Aug 2017 00:43:25 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Ruiyu Ni , Sean Brogan , Jiewen Yao , Michael D Kinney Date: Fri, 25 Aug 2017 15:43:23 +0800 Message-Id: <20170825074323.390468-1-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.12.2.windows.2 Subject: [PATCH] MdeModulePkg/PciBusDxe: Enable Bus Master on P2P bridges on demand 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: Fri, 25 Aug 2017 07:40:51 -0000 From: Ruiyu Ni The patch dynamically enables Bus Master on P2P bridges only when requested by a device driver through PciIo.Attribute() to enable the Bus Master. Signed-off-by: Sean Brogan Signed-off-by: Ruiyu Ni Cc: Jiewen Yao Cc: Michael D Kinney --- MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c | 16 +++++++++++++--- MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c | 18 +++++++++++++++--- MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 8 ++++---- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c index c0227fa2b6..359b9ded6d 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c @@ -1,7 +1,7 @@ /** @file Supporting functions implementaion for PCI devices management. -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
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,7 +711,12 @@ StartPciDevicesOnBridge ( 0, &Supports ); - Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE; + // + // 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); PciIoDevice->PciIo.Attributes ( &(PciIoDevice->PciIo), EfiPciIoAttributeOperationEnable, @@ -763,7 +768,12 @@ StartPciDevicesOnBridge ( 0, &Supports ); - Supports &= (UINT64)EFI_PCI_DEVICE_ENABLE; + // + // 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); PciIoDevice->PciIo.Attributes ( &(PciIoDevice->PciIo), EfiPciIoAttributeOperationEnable, diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c index 81171c82d9..f73756a31e 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c @@ -1218,11 +1218,12 @@ DetermineDeviceAttribute ( return Status; } // - // Assume the PCI Root Bridge supports DAC + // Assume the PCI Root Bridge supports DAC and Bus Master. // 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_DUAL_ADDRESS_CYCLE | + EFI_PCI_IO_ATTRIBUTE_BUS_MASTER); } else { @@ -1233,9 +1234,16 @@ 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; // @@ -1245,7 +1253,11 @@ 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); // diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c index cc7125e4fc..659f480d71 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c @@ -1348,7 +1348,8 @@ 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_DUAL_ADDRESS_CYCLE | + EFI_PCI_IO_ATTRIBUTE_BUS_MASTER); // // Record the new attribute of the Root Bridge @@ -1726,12 +1727,11 @@ PciIoAttributes ( } // // The upstream bridge should be also set to revelant attribute - // expect for IO, Mem and BusMaster + // expect for IO and Mem // UpStreamAttributes = Attributes & (~(EFI_PCI_IO_ATTRIBUTE_IO | - EFI_PCI_IO_ATTRIBUTE_MEMORY | - EFI_PCI_IO_ATTRIBUTE_BUS_MASTER + EFI_PCI_IO_ATTRIBUTE_MEMORY ) ); UpStreamBridge = PciIoDevice->Parent; -- 2.12.2.windows.2