On Sat, 2015-07-11 at 23:30:35 UTC, Wei Yang wrote:
> PFs are enumerated on PCI bus, while VFs are created by PF's driver.
>
> In EEH recovery, it has two cases:
> 1. Device and driver is EEH aware, error handlers are called.
> 2. Device and driver is not EEH aware, un-plug the device and plug it again
> by enumerating it.
>
> The special thing happens on the second case. For a PF, we could use the
> original pci core to enumerate the bus, while for VF we need to record the
> VFs which aer un-plugged then plug it again.
>
> Also The patch caches the VF index in pci_dn, which can be used to
> calculate VF's bus, device and function number. Those information helps to
> locate the VF's PCI device instance when doing hotplug during EEH recovery
> if necessary.
> diff --git a/arch/powerpc/include/asm/pci-bridge.h
> b/arch/powerpc/include/asm/pci-bridge.h
> index 9b365d6..533e6e9 100644
> --- a/arch/powerpc/include/asm/pci-bridge.h
> +++ b/arch/powerpc/include/asm/pci-bridge.h
> @@ -211,6 +211,7 @@ struct pci_dn {
> #define IODA_INVALID_PE (-1)
> #ifdef CONFIG_PPC_POWERNV
> int pe_number;
> + int vf_index; /* VF index in the PF */
> diff --git a/arch/powerpc/kernel/eeh_driver.c
> b/arch/powerpc/kernel/eeh_driver.c
> index 89eb4bc..f25428a 100644
> --- a/arch/powerpc/kernel/eeh_driver.c
> +++ b/arch/powerpc/kernel/eeh_driver.c
> @@ -386,12 +396,39 @@ static void *eeh_report_failure(void *data, void
> *userdata)
> return NULL;
> }
>
> +static void *eeh_add_virt_device(void *data, void *userdata)
> +{
> + struct pci_driver *driver;
> + struct eeh_dev *edev = (struct eeh_dev *)data;
> + struct pci_dev *dev = eeh_dev_to_pci_dev(edev);
> + struct pci_dn *pdn = eeh_dev_to_pdn(edev);
> +
> + if (!(edev->physfn)) {
> + pr_warn("%s: EEH dev %04x:%02x:%02x.%01x not for VF\n",
> + __func__, edev->phb->global_number, pdn->busno,
> + PCI_SLOT(pdn->devfn), PCI_FUNC(pdn->devfn));
> + return NULL;
> + }
> +
> + driver = eeh_pcid_get(dev);
> + if (driver) {
> + eeh_pcid_put(dev);
> + if (driver->err_handler)
> + return NULL;
> + }
> +
> + pci_iov_virtfn_add(edev->physfn, pdn->vf_index, 0);
^
This is giving me:
arch/powerpc/kernel/eeh_driver.c:420:38: error: 'struct pci_dn' has no member
named 'vf_index'
And similarly:
arch/powerpc/kernel/eeh_driver.c:472:42: error: 'struct pci_dn' has no member
named 'vf_index'
arch/powerpc/kernel/eeh_driver.c:479:6: error: 'struct pci_dn' has no member
named 'pe_number'
For pseries_defconfig with POWERNV=n.
The reason is that those fields are #ifdef POWERNV, but eeh_driver.c is still
built for PSERIES.
More here:
http://kisskb.ellerman.id.au/kisskb/buildresult/12550871/
cheers
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
