From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 68CA7210EB125 for ; Fri, 10 Aug 2018 01:54:10 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Aug 2018 01:54:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,218,1531810800"; d="scan'208";a="71718271" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by FMSMGA003.fm.intel.com with ESMTP; 10 Aug 2018 01:54:10 -0700 Received: from fmsmsx124.amr.corp.intel.com (10.18.125.39) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 10 Aug 2018 01:54:09 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx124.amr.corp.intel.com (10.18.125.39) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 10 Aug 2018 01:54:09 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.226]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.205]) with mapi id 14.03.0319.002; Fri, 10 Aug 2018 16:54:07 +0800 From: "Zeng, Star" To: "Zhang, Shenglei" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Zeng, Star" Thread-Topic: [PATCH 06/26] MdeModulePkg PciBusDxe: Remove redundant functions Thread-Index: AQHULvR7zANTf9ie8UqTtx7EiiDYIqS4sWhw Date: Fri, 10 Aug 2018 08:54:07 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103BBABE4E@shsmsx102.ccr.corp.intel.com> References: <20180808084712.34696-1-shenglei.zhang@intel.com> <20180808084712.34696-7-shenglei.zhang@intel.com> In-Reply-To: <20180808084712.34696-7-shenglei.zhang@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 06/26] MdeModulePkg PciBusDxe: Remove redundant functions X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2018 08:54:11 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----Original Message----- From: Zhang, Shenglei=20 Sent: Wednesday, August 8, 2018 4:47 PM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Dong, Eric Subject: [PATCH 06/26] MdeModulePkg PciBusDxe: Remove redundant functions The functions that are never called have been removed. They are UpStreamBridgesAttributes and GetHpcPciAddressFromRootBridge. https://bugzilla.tianocore.org/show_bug.cgi?id=3D1062 Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei --- .../Bus/Pci/PciBusDxe/PciDeviceSupport.c | 80 ------------------- .../Bus/Pci/PciBusDxe/PciDeviceSupport.h | 17 ---- MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 41 ---------- MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h | 21 ----- 4 files changed, 159 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c b/MdeModuleP= kg/Bus/Pci/PciBusDxe/PciDeviceSupport.c index 48cf57a24f..f7039da992 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c @@ -1061,85 +1061,5 @@ ActiveVGADeviceOnTheRootBridge ( } =20 =20 -/** - Get HPC PCI address according to its device path. - - @param RootBridge Root bridege Io instance. - @param RemainingDevicePath Given searching device path. - @param PciAddress Buffer holding searched result. - - @retval EFI_SUCCESS PCI address was stored in PciAddress - @retval EFI_NOT_FOUND Can not find the specific device path. - -**/ -EFI_STATUS -GetHpcPciAddressFromRootBridge ( - IN PCI_IO_DEVICE *RootBridge, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath, - OUT UINT64 *PciAddress - ) -{ - EFI_DEV_PATH_PTR Node; - PCI_IO_DEVICE *Temp; - EFI_DEVICE_PATH_PROTOCOL *CurrentDevicePath; - LIST_ENTRY *CurrentLink; - BOOLEAN MisMatch; - - MisMatch =3D FALSE; - - CurrentDevicePath =3D RemainingDevicePath; - Node.DevPath =3D CurrentDevicePath; - Temp =3D NULL; - - while (!IsDevicePathEnd (CurrentDevicePath)) { - - CurrentLink =3D RootBridge->ChildList.ForwardLink; - Node.DevPath =3D CurrentDevicePath; - - while (CurrentLink !=3D NULL && CurrentLink !=3D &RootBridge->ChildLis= t) { - Temp =3D PCI_IO_DEVICE_FROM_LINK (CurrentLink); - - if (Node.Pci->Device =3D=3D Temp->DeviceNumber && - Node.Pci->Function =3D=3D Temp->FunctionNumber) { - RootBridge =3D Temp; - break; - } - - CurrentLink =3D CurrentLink->ForwardLink; - } - - // - // Check if we find the bridge - // - if (CurrentLink =3D=3D &RootBridge->ChildList) { - - MisMatch =3D TRUE; - break; - - } - - CurrentDevicePath =3D NextDevicePathNode (CurrentDevicePath); - } - - if (MisMatch) { - - CurrentDevicePath =3D NextDevicePathNode (CurrentDevicePath); - - if (IsDevicePathEnd (CurrentDevicePath)) { - *PciAddress =3D EFI_PCI_ADDRESS (RootBridge->BusNumber, Node.Pci->De= vice, Node.Pci->Function, 0); - return EFI_SUCCESS; - } - - return EFI_NOT_FOUND; - } =20 - if (Temp !=3D NULL) { - *PciAddress =3D EFI_PCI_ADDRESS (Temp->BusNumber, Temp->DeviceNumber, = Temp->FunctionNumber, 0); - } else { - return EFI_NOT_FOUND; - } - - return EFI_SUCCESS; - -} =20 diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h b/MdeModuleP= kg/Bus/Pci/PciBusDxe/PciDeviceSupport.h index 1a01e72b1e..c282381f85 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h @@ -255,23 +255,6 @@ ActiveVGADeviceOnTheRootBridge ( IN PCI_IO_DEVICE *RootBridge ); =20 -/** - Get HPC PCI address according to its device path. - - @param RootBridge Root bridege Io instance. - @param RemainingDevicePath Given searching device path. - @param PciAddress Buffer holding searched result. - - @retval EFI_SUCCESS PCI address was stored in PciAddress. - @retval EFI_NOT_FOUND Can not find the specific device path. - -**/ -EFI_STATUS -GetHpcPciAddressFromRootBridge ( - IN PCI_IO_DEVICE *RootBridge, - IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath, - OUT UINT64 *PciAddress - ); =20 /** Destroy a pci device node. diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/MdeModulePkg/Bus/Pci/= PciBusDxe/PciIo.c index 87b0b9884a..291578c63c 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c @@ -2061,47 +2061,6 @@ PciIoSetBarAttributes ( return EFI_SUCCESS; } =20 -/** - Program parent bridge's attribute recurrently. - - @param PciIoDevice Child Pci device instance - @param Operation The operation to perform on the attributes for this = PCI controller. - @param Attributes The mask of attributes that are used for Set, Enable= , and Disable - operations. - - @retval EFI_SUCCESS The operation on the PCI controller's attr= ibutes was completed. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - @retval EFI_UNSUPPORTED one or more of the bits set in - Attributes are not supported by this PCI c= ontroller or one of - its parent bridges when Operation is Set, = Enable or Disable. - -**/ -EFI_STATUS -UpStreamBridgesAttributes ( - IN PCI_IO_DEVICE *PciIoDevice, - IN EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION Operation, - IN UINT64 Attributes - ) -{ - PCI_IO_DEVICE *Parent; - EFI_PCI_IO_PROTOCOL *PciIo; - - Parent =3D PciIoDevice->Parent; - - while (Parent !=3D NULL && IS_PCI_BRIDGE (&Parent->Pci)) { - - // - // Get the PciIo Protocol - // - PciIo =3D &Parent->PciIo; - - PciIo->Attributes (PciIo, Operation, Attributes, NULL); - - Parent =3D Parent->Parent; - } - - return EFI_SUCCESS; -} =20 /** Test whether two Pci devices has same parent bridge. diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h b/MdeModulePkg/Bus/Pci/= PciBusDxe/PciIo.h index b7e38ded3f..69e7c32881 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.h @@ -646,27 +646,6 @@ PciIoSetBarAttributes ( IN OUT UINT64 *Length ); =20 -/** - Program parent bridge's attribute recurrently. - - @param PciIoDevice Child Pci device instance - @param Operation The operation to perform on the attributes for this = PCI controller. - @param Attributes The mask of attributes that are used for Set, Enable= , and Disable - operations. - - @retval EFI_SUCCESS The operation on the PCI controller's attr= ibutes was completed. - @retval EFI_INVALID_PARAMETER One or more parameters are invalid. - @retval EFI_UNSUPPORTED one or more of the bits set in - Attributes are not supported by this PCI c= ontroller or one of - its parent bridges when Operation is Set, = Enable or Disable. - -**/ -EFI_STATUS -UpStreamBridgesAttributes ( - IN PCI_IO_DEVICE *PciIoDevice, - IN EFI_PCI_IO_PROTOCOL_ATTRIBUTE_OPERATION Operation, - IN UINT64 Attributes - ); =20 /** Test whether two Pci devices has same parent bridge. -- 2.18.0.windows.1