Commit 988fc3ba authored by Bryant G. Ly's avatar Bryant G. Ly Committed by Michael Ellerman
Browse files

powerpc/pci: Separate SR-IOV Calls 



SR-IOV can now be enabled for the powernv platform and pseries
platform. Therefore move the appropriate calls to machine dependent
code instead of relying on definition at compile time.

Signed-off-by: default avatarBryant G. Ly <bryantly@linux.vnet.ibm.com>
Signed-off-by: default avatarJuan J. Alvarez <jjalvare@us.ibm.com>
Acked-by: default avatarRussell Currey <ruscur@russell.cc>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 5c45b528

arch/powerpc/include/asm/machdep.h

+8 −0
Original line number Diff line number Diff line
@@ -172,11 +172,19 @@ struct machdep_calls { 
	/* Called after scan and before resource survey */

	void (*pcibios_fixup_phb)(struct pci_controller *hose);



	/*

	 * Called after device has been added to bus and

	 * before sysfs has been created.

	 */

	void (*pcibios_bus_add_device)(struct pci_dev *pdev);



	resource_size_t (*pcibios_default_alignment)(void);



#ifdef CONFIG_PCI_IOV

	void (*pcibios_fixup_sriov)(struct pci_dev *pdev);

	resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);

	int (*pcibios_sriov_enable)(struct pci_dev *pdev, u16 num_vfs);

	int (*pcibios_sriov_disable)(struct pci_dev *pdev);

#endif /* CONFIG_PCI_IOV */



	/* Called to shutdown machine specific hardware not already controlled

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

+1 −3
Original line number Diff line number Diff line
@@ -203,10 +203,9 @@ struct pci_dn { 
	struct eeh_dev *edev;		/* eeh device */

#endif

#define IODA_INVALID_PE		0xFFFFFFFF

#ifdef CONFIG_PPC_POWERNV

	unsigned int pe_number;

	int     vf_index;		/* VF index in the PF */

#ifdef CONFIG_PCI_IOV

	int     vf_index;		/* VF index in the PF */

	u16     vfs_expanded;		/* number of VFs IOV BAR expanded */

	u16     num_vfs;		/* number of VFs enabled*/

	unsigned int *pe_num_map;	/* PE# for the first VF PE or array */
@@ -215,7 +214,6 @@ struct pci_dn { 
	int     (*m64_map)[PCI_SRIOV_NUM_BARS];

#endif /* CONFIG_PCI_IOV */

	int	mps;			/* Maximum Payload Size */

#endif

	struct list_head child_list;

	struct list_head list;

	struct resource holes[PCI_SRIOV_NUM_BARS];

arch/powerpc/kernel/eeh_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static void *eeh_add_virt_device(void *data, void *userdata) 
			return NULL;

	}



#ifdef CONFIG_PPC_POWERNV

#ifdef CONFIG_PCI_IOV

	pci_iov_add_virtfn(edev->physfn, pdn->vf_index);

#endif

	return NULL;
@@ -496,7 +496,7 @@ static void *eeh_rmv_device(void *data, void *userdata) 
		(*removed)++;



	if (edev->physfn) {

#ifdef CONFIG_PPC_POWERNV

#ifdef CONFIG_PCI_IOV

		struct pci_dn *pdn = eeh_dev_to_pdn(edev);



		pci_iov_remove_virtfn(edev->physfn, pdn->vf_index);

arch/powerpc/kernel/pci-common.c

+23 −0
Original line number Diff line number Diff line
@@ -249,8 +249,31 @@ resource_size_t pcibios_iov_resource_alignment(struct pci_dev *pdev, int resno) 


	return pci_iov_resource_size(pdev, resno);

}



int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)

{

	if (ppc_md.pcibios_sriov_enable)

		return ppc_md.pcibios_sriov_enable(pdev, num_vfs);



	return 0;

}



int pcibios_sriov_disable(struct pci_dev *pdev)

{

	if (ppc_md.pcibios_sriov_disable)

		return ppc_md.pcibios_sriov_disable(pdev);



	return 0;

}



#endif /* CONFIG_PCI_IOV */



void pcibios_bus_add_device(struct pci_dev *pdev)

{

	if (ppc_md.pcibios_bus_add_device)

		ppc_md.pcibios_bus_add_device(pdev);

}



static resource_size_t pcibios_io_size(const struct pci_controller *hose)

{

#ifdef CONFIG_PPC64

arch/powerpc/kernel/pci_dn.c

+0 −6
Original line number Diff line number Diff line
@@ -156,10 +156,8 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent, 
	pdn->parent = parent;

	pdn->busno = busno;

	pdn->devfn = devfn;

#ifdef CONFIG_PPC_POWERNV

	pdn->vf_index = vf_index;

	pdn->pe_number = IODA_INVALID_PE;

#endif

	INIT_LIST_HEAD(&pdn->child_list);

	INIT_LIST_HEAD(&pdn->list);

	list_add_tail(&pdn->list, &parent->child_list);
@@ -226,9 +224,7 @@ void remove_dev_pci_data(struct pci_dev *pdev) 
	 */

	if (pdev->is_virtfn) {

		pdn = pci_get_pdn(pdev);

#ifdef CONFIG_PPC_POWERNV

		pdn->pe_number = IODA_INVALID_PE;

#endif

		return;

	}
@@ -294,9 +290,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, 
		return NULL;

	dn->data = pdn;

	pdn->phb = hose;

#ifdef CONFIG_PPC_POWERNV

	pdn->pe_number = IODA_INVALID_PE;

#endif

	regs = of_get_property(dn, "reg", NULL);

	if (regs) {

		u32 addr = of_read_number(regs, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE