On 06/07/2020 11:36, Oliver O'Halloran wrote:
> Drivers that do not support the PCI error handling callbacks are handled by
> tearing down the device and re-probing them. If the device to be removed is
> a virtual function we need to know the index of the index of the VF so that
Too many indexes in "the index of the index of "?
> we can remove it with the pci_iov_{add|remove}_virtfn() API.
>
> Currently this is handled by looking up the pci_dn, and using the vf_index
> that was stashed there when the pci_dn for the VF was created in
> pcibios_sriov_enable(). We would like to eliminate the use of pci_dn
> outside of pseries though so we need to provide the generic EEH code with
> some other way to find the vf_index.
>
> The easiest thing to do here is move the vf_index field out of pci_dn and
> into eeh_dev. Currently pci_dn and eeh_dev are allocated and initialized
> together so this is a fairly minimal change in preparation for splitting
> pci_dn and eeh_dev in the future.
>
> Signed-off-by: Oliver O'Halloran <ooh...@gmail.com>
Reviewed-by: Alexey Kardashevskiy <a...@ozlabs.ru>
> ---
> arch/powerpc/include/asm/eeh.h | 3 +++
> arch/powerpc/include/asm/pci-bridge.h | 1 -
> arch/powerpc/kernel/eeh_driver.c | 6 ++----
> arch/powerpc/kernel/pci_dn.c | 7 ++++---
> 4 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
> index e22881a0c415..3d648e042835 100644
> --- a/arch/powerpc/include/asm/eeh.h
> +++ b/arch/powerpc/include/asm/eeh.h
> @@ -148,7 +148,10 @@ struct eeh_dev {
> struct pci_dn *pdn; /* Associated PCI device node */
> struct pci_dev *pdev; /* Associated PCI device */
> bool in_error; /* Error flag for edev */
> +
> + /* VF specific properties */
> struct pci_dev *physfn; /* Associated SRIOV PF */
> + int vf_index; /* Index of this VF */
> };
>
> /* "fmt" must be a simple literal string */
> diff --git a/arch/powerpc/include/asm/pci-bridge.h
> b/arch/powerpc/include/asm/pci-bridge.h
> index b92e81b256e5..d2a2a14e56f9 100644
> --- a/arch/powerpc/include/asm/pci-bridge.h
> +++ b/arch/powerpc/include/asm/pci-bridge.h
> @@ -202,7 +202,6 @@ struct pci_dn {
> #define IODA_INVALID_PE 0xFFFFFFFF
> unsigned int pe_number;
> #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 */
> diff --git a/arch/powerpc/kernel/eeh_driver.c
> b/arch/powerpc/kernel/eeh_driver.c
> index 7b048cee767c..b70b9273f45a 100644
> --- a/arch/powerpc/kernel/eeh_driver.c
> +++ b/arch/powerpc/kernel/eeh_driver.c
> @@ -477,7 +477,7 @@ static void *eeh_add_virt_device(struct eeh_dev *edev)
> }
>
> #ifdef CONFIG_PCI_IOV
> - pci_iov_add_virtfn(edev->physfn, eeh_dev_to_pdn(edev)->vf_index);
> + pci_iov_add_virtfn(edev->physfn, edev->vf_index);
> #endif
> return NULL;
> }
> @@ -521,9 +521,7 @@ static void eeh_rmv_device(struct eeh_dev *edev, void
> *userdata)
>
> if (edev->physfn) {
> #ifdef CONFIG_PCI_IOV
> - struct pci_dn *pdn = eeh_dev_to_pdn(edev);
> -
> - pci_iov_remove_virtfn(edev->physfn, pdn->vf_index);
> + pci_iov_remove_virtfn(edev->physfn, edev->vf_index);
> edev->pdev = NULL;
> #endif
> if (rmv_data)
> diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
> index f790a8d06f50..bf11ac8427ac 100644
> --- a/arch/powerpc/kernel/pci_dn.c
> +++ b/arch/powerpc/kernel/pci_dn.c
> @@ -146,7 +146,6 @@ static struct eeh_dev *eeh_dev_init(struct pci_dn *pdn)
>
> #ifdef CONFIG_PCI_IOV
> static struct pci_dn *add_one_sriov_vf_pdn(struct pci_dn *parent,
> - int vf_index,
> int busno, int devfn)
> {
> struct pci_dn *pdn;
> @@ -163,7 +162,6 @@ static struct pci_dn *add_one_sriov_vf_pdn(struct pci_dn
> *parent,
> pdn->parent = parent;
> pdn->busno = busno;
> pdn->devfn = devfn;
> - pdn->vf_index = vf_index;
> pdn->pe_number = IODA_INVALID_PE;
> INIT_LIST_HEAD(&pdn->child_list);
> INIT_LIST_HEAD(&pdn->list);
> @@ -194,7 +192,7 @@ struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev)
> for (i = 0; i < pci_sriov_get_totalvfs(pdev); i++) {
> struct eeh_dev *edev __maybe_unused;
>
> - pdn = add_one_sriov_vf_pdn(parent, i,
> + pdn = add_one_sriov_vf_pdn(parent,
> pci_iov_virtfn_bus(pdev, i),
> pci_iov_virtfn_devfn(pdev, i));
> if (!pdn) {
> @@ -207,7 +205,10 @@ struct pci_dn *add_sriov_vf_pdns(struct pci_dev *pdev)
> /* Create the EEH device for the VF */
> edev = eeh_dev_init(pdn);
> BUG_ON(!edev);
> +
> + /* FIXME: these should probably be populated by the EEH probe */
> edev->physfn = pdev;
> + edev->vf_index = i;
> #endif /* CONFIG_EEH */
> }
> return pci_get_pdn(pdev);
>
--
Alexey
