Re: [edk2] [PATCH 06/26] MdeModulePkg PciBusDxe: Remove redundant functions
Reviewed-by: Star Zeng -Original Message- From: Zhang, Shenglei 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=1062 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/MdeModulePkg/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 ( } -/** - 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 = FALSE; - - CurrentDevicePath = RemainingDevicePath; - Node.DevPath = CurrentDevicePath; - Temp = NULL; - - while (!IsDevicePathEnd (CurrentDevicePath)) { - -CurrentLink = RootBridge->ChildList.ForwardLink; -Node.DevPath = CurrentDevicePath; - -while (CurrentLink != NULL && CurrentLink != >ChildList) { - Temp = PCI_IO_DEVICE_FROM_LINK (CurrentLink); - - if (Node.Pci->Device == Temp->DeviceNumber && - Node.Pci->Function == Temp->FunctionNumber) { -RootBridge = Temp; -break; - } - - CurrentLink = CurrentLink->ForwardLink; -} - -// -// Check if we find the bridge -// -if (CurrentLink == >ChildList) { - - MisMatch = TRUE; - break; - -} - -CurrentDevicePath = NextDevicePathNode (CurrentDevicePath); - } - - if (MisMatch) { - -CurrentDevicePath = NextDevicePathNode (CurrentDevicePath); - -if (IsDevicePathEnd (CurrentDevicePath)) { - *PciAddress = EFI_PCI_ADDRESS (RootBridge->BusNumber, Node.Pci->Device, Node.Pci->Function, 0); - return EFI_SUCCESS; -} - -return EFI_NOT_FOUND; - } - if (Temp != NULL) { -*PciAddress = EFI_PCI_ADDRESS (Temp->BusNumber, Temp->DeviceNumber, Temp->FunctionNumber, 0); - } else { -return EFI_NOT_FOUND; - } - - return EFI_SUCCESS; - -} diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h b/MdeModulePkg/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 ); -/** - 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 - ); /** 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; } -/** - Program parent bridge's attribute recurrently. - - @param PciIoDevice Child Pci device instance - @param OperationThe 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
Re: [edk2] [PATCH 06/26] MdeModulePkg PciBusDxe: Remove redundant functions
On 08/08/18 10:46, shenglei wrote: > The functions that are never called have been removed. > They are UpStreamBridgesAttributes and GetHpcPciAddressFromRootBridge. > https://bugzilla.tianocore.org/show_bug.cgi?id=1062 > > 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(-) Reviewed-by: Laszlo Ersek ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH 06/26] MdeModulePkg PciBusDxe: Remove redundant functions
Reviewed-by: Ruiyu Ni Thanks/Ray > -Original Message- > From: edk2-devel On Behalf Of shenglei > Sent: Wednesday, August 8, 2018 4:47 PM > To: edk2-devel@lists.01.org > Cc: Dong, Eric ; Zeng, Star > Subject: [edk2] [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=1062 > > 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/MdeModulePkg/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 ( } > > > -/** > - 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 = FALSE; > - > - CurrentDevicePath = RemainingDevicePath; > - Node.DevPath = CurrentDevicePath; > - Temp = NULL; > - > - while (!IsDevicePathEnd (CurrentDevicePath)) { > - > -CurrentLink = RootBridge->ChildList.ForwardLink; > -Node.DevPath = CurrentDevicePath; > - > -while (CurrentLink != NULL && CurrentLink != >ChildList) { > - Temp = PCI_IO_DEVICE_FROM_LINK (CurrentLink); > - > - if (Node.Pci->Device == Temp->DeviceNumber && > - Node.Pci->Function == Temp->FunctionNumber) { > -RootBridge = Temp; > -break; > - } > - > - CurrentLink = CurrentLink->ForwardLink; > -} > - > -// > -// Check if we find the bridge > -// > -if (CurrentLink == >ChildList) { > - > - MisMatch = TRUE; > - break; > - > -} > - > -CurrentDevicePath = NextDevicePathNode (CurrentDevicePath); > - } > - > - if (MisMatch) { > - > -CurrentDevicePath = NextDevicePathNode (CurrentDevicePath); > - > -if (IsDevicePathEnd (CurrentDevicePath)) { > - *PciAddress = EFI_PCI_ADDRESS (RootBridge->BusNumber, Node.Pci- > >Device, Node.Pci->Function, 0); > - return EFI_SUCCESS; > -} > - > -return EFI_NOT_FOUND; > - } > > - if (Temp != NULL) { > -*PciAddress = EFI_PCI_ADDRESS (Temp->BusNumber, Temp- > >DeviceNumber, Temp->FunctionNumber, 0); > - } else { > -return EFI_NOT_FOUND; > - } > - > - return EFI_SUCCESS; > - > -} > > diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h > b/MdeModulePkg/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 >); > > -/** > - 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 > - ); > > /** >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; > } > > -/** > - Program parent