Commit 452f145e authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Michael Ellerman
Browse files

powerpc: Drop superfluous pci_dev_is_added() calls 



On powerpc, pci_dev_is_added() is called as part of SR-IOV fixups
that are done under pcibios_add_device() which in turn is only called in
pci_device_add() whih is called when a PCI device is scanned.

pci_dev_assign_added() is called in pci_bus_add_device() which is only
called after scanning the device. Thus pci_dev_is_added() is always
false and can be dropped.

Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarOliver O'Halloran <oohall@gmail.com>
[mpe: Tweak change log slightly to reflect Oliver's comments]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210910141940.2598035-2-schnelle@linux.ibm.com
parent 9d7fb064

arch/powerpc/platforms/powernv/pci-sriov.c

+0 −6
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 


#include "pci.h"



/* for pci_dev_is_added() */

#include "../../../../drivers/pci/pci.h"



/*

 * The majority of the complexity in supporting SR-IOV on PowerNV comes from

 * the need to put the MMIO space for each VF into a separate PE. Internally
@@ -228,9 +225,6 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev) 


void pnv_pci_ioda_fixup_iov(struct pci_dev *pdev)

{

	if (WARN_ON(pci_dev_is_added(pdev)))

		return;



	if (pdev->is_virtfn) {

		struct pnv_ioda_pe *pe = pnv_ioda_get_pe(pdev);

arch/powerpc/platforms/pseries/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ 
#include <asm/hvconsole.h>



#include "pseries.h"

#include "../../../../drivers/pci/pci.h"



DEFINE_STATIC_KEY_FALSE(shared_processor);

EXPORT_SYMBOL(shared_processor);
@@ -750,7 +749,7 @@ static void pseries_pci_fixup_iov_resources(struct pci_dev *pdev) 
	const int *indexes;

	struct device_node *dn = pci_device_to_OF_node(pdev);



	if (!pdev->is_physfn || pci_dev_is_added(pdev))

	if (!pdev->is_physfn)

		return;

	/*Firmware must support open sriov otherwise dont configure*/

	indexes = of_get_property(dn, "ibm,open-sriov-vf-bar-info", NULL);