Commit 8cd6aacc authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/pcidn: Make VF pci_dn management CONFIG_PCI_IOV specific 



The powerpc PCI code requires that a pci_dn structure exists for all
devices in the system. This is fine for real devices since at boot a pci_dn
is created for each PCI device in the DT and it's fine for hotplugged devices
since the hotplug slot driver will manage the pci_dn's devices in hotplug
slots. For SR-IOV, we need the platform / pcibios to manage the pci_dn for
virtual functions since firmware is unaware of VFs, and they aren't
"hot plugged" in the traditional sense.

Management of the pci_dn is handled by the, poorly named, functions:
add_pci_dev_data() and remove_pci_dev_data(). The entire body of these
functions is #ifdef`ed around CONFIG_PCI_IOV and they cannot be used
in any other context, so make them only available when CONFIG_PCI_IOV
is selected, and rename them to reflect their actual usage rather than
having them masquerade as generic code.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Reviewed-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190821062655.19735-2-oohall@gmail.com
parent 1fb4124c

arch/powerpc/include/asm/pci-bridge.h

+5 −2
Original line number Diff line number Diff line
@@ -223,12 +223,15 @@ struct pci_dn { 
extern struct pci_dn *pci_get_pdn_by_devfn(struct pci_bus *bus,

					   int devfn);

extern struct pci_dn *pci_get_pdn(struct pci_dev *pdev);

extern struct pci_dn *add_dev_pci_data(struct pci_dev *pdev);

extern void remove_dev_pci_data(struct pci_dev *pdev);

extern struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,

					       struct device_node *dn);

extern void pci_remove_device_node_info(struct device_node *dn);



#ifdef CONFIG_PCI_IOV

struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev);

void remove_sriov_vf_pdns(struct pci_dev *pdev);

#endif



static inline int pci_device_from_OF_node(struct device_node *np,

					  u8 *bus, u8 *devfn)

{

arch/powerpc/kernel/pci_dn.c

+5 −10
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ struct pci_dn *pci_get_pdn(struct pci_dev *pdev) 
}



#ifdef CONFIG_PCI_IOV

static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent,

static struct pci_dn *add_one_sriov_vf_pdn(struct pci_dn *parent,

					   int vf_index,

					   int busno, int devfn)

{
@@ -151,11 +151,9 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, 


	return pdn;

}

#endif



struct pci_dn *add_dev_pci_data(struct pci_dev *pdev)

struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev)

{

#ifdef CONFIG_PCI_IOV

	struct pci_dn *parent, *pdn;

	int i;
@@ -176,7 +174,7 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) 
	for (i = 0; i < pci_sriov_get_totalvfs(pdev); i++) {

		struct eeh_dev *edev __maybe_unused;



		pdn = add_one_dev_pci_data(parent, i,

		pdn = add_one_sriov_vf_pdn(parent, i,

					   pci_iov_virtfn_bus(pdev, i),

					   pci_iov_virtfn_devfn(pdev, i));

		if (!pdn) {
@@ -192,14 +190,11 @@ struct pci_dn *add_dev_pci_data(struct pci_dev *pdev) 
		edev->physfn = pdev;

#endif /* CONFIG_EEH */

	}

#endif /* CONFIG_PCI_IOV */



	return pci_get_pdn(pdev);

}



void remove_dev_pci_data(struct pci_dev *pdev)

void remove_sriov_vf_pdns(struct pci_dev *pdev)

{

#ifdef CONFIG_PCI_IOV

	struct pci_dn *parent;

	struct pci_dn *pdn, *tmp;

	int i;
@@ -271,8 +266,8 @@ void remove_dev_pci_data(struct pci_dev *pdev) 
			kfree(pdn);

		}

	}

#endif /* CONFIG_PCI_IOV */

}

#endif /* CONFIG_PCI_IOV */



struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,

					struct device_node *dn)

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

+2 −2
Original line number Diff line number Diff line
@@ -1747,14 +1747,14 @@ int pnv_pcibios_sriov_disable(struct pci_dev *pdev) 
	pnv_pci_sriov_disable(pdev);



	/* Release PCI data */

	remove_dev_pci_data(pdev);

	remove_sriov_vf_pdns(pdev);

	return 0;

}



int pnv_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)

{

	/* Allocate PCI data */

	add_dev_pci_data(pdev);

	add_sriov_vf_pdns(pdev);



	return pnv_pci_sriov_enable(pdev, num_vfs);

}

arch/powerpc/platforms/pseries/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int pseries_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs) 
int pseries_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)

{

	/* Allocate PCI data */

	add_dev_pci_data(pdev);

	add_sriov_vf_pdns(pdev);

	return pseries_pci_sriov_enable(pdev, num_vfs);

}
@@ -204,7 +204,7 @@ int pseries_pcibios_sriov_disable(struct pci_dev *pdev) 
	/* Releasing pe_num_map */

	kfree(pdn->pe_num_map);

	/* Release PCI data */

	remove_dev_pci_data(pdev);

	remove_sriov_vf_pdns(pdev);

	pci_vf_drivers_autoprobe(pdev, true);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE