| Message ID | 20180103171633.94499-4-bryantly@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 04/01/18 04:16, Bryant G. Ly wrote: > To correctly use EEH code one has to make > sure that the EEH_PE_VF is set for dynamic created > VFs. Therefore this patch allocates an eeh_pe of > eeh type EEH_PE_VF and associates PE with parent. > > Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> > Signed-off-by: Juan J. Alvarez <jjalvare@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/pci-bridge.h | 5 ++++- > arch/powerpc/platforms/pseries/eeh_pseries.c | 14 +++++++++++++- > 2 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h > index 9f66ddebb799..16d70740a76f 100644 > --- a/arch/powerpc/include/asm/pci-bridge.h > +++ b/arch/powerpc/include/asm/pci-bridge.h > @@ -211,7 +211,10 @@ struct pci_dn { > unsigned int *pe_num_map; /* PE# for the first VF PE or array */ > bool m64_single_mode; /* Use M64 BAR in Single Mode */ > #define IODA_INVALID_M64 (-1) > - int (*m64_map)[PCI_SRIOV_NUM_BARS]; > + union { > + int (*m64_map)[PCI_SRIOV_NUM_BARS]; /*Only used in powernv */ > + int last_allow_rc; /* Only used in pSeries */ > + }; > #endif /* CONFIG_PCI_IOV */ > int mps; /* Maximum Payload Size */ > struct list_head child_list; > diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c > index a671ef4f57f5..686e9c7feab5 100644 > --- a/arch/powerpc/platforms/pseries/eeh_pseries.c > +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c > @@ -58,6 +58,8 @@ static int ibm_configure_pe; > void pseries_pcibios_bus_add_device(struct pci_dev *pdev) > { > struct pci_dn *pdn = pci_get_pdn(pdev); > + struct pci_dn *physfn_pdn; > + struct eeh_dev *edev; > > if (!pdev->is_virtfn) > return; > @@ -65,6 +67,14 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev) > pdn->device_id = pdev->device; > pdn->vendor_id = pdev->vendor; > pdn->class_code = pdev->class; > + /* Last allow unfreeze return code used for retrieval > + * by user space in eeh-sysfs to show the last command > + * completion from platform > + */ > + pdn->last_allow_rc = 0; Fails to compile without CONFIG_IOV: /home/aik/p/guest-kernel/arch/powerpc/platforms/pseries/eeh_pseries.c: In function ‘pseries_pcibios_bus_add_device’: /home/aik/p/guest-kernel/arch/powerpc/platforms/pseries/eeh_pseries.c:74:5: error: ‘struct pci_dn’ has no member named ‘last_allow_rc’ pdn->last_allow_rc = 0; ^ There are more actually, you try and see. > + physfn_pdn = pci_get_pdn(pdev->physfn); > + pdn->pe_number = physfn_pdn->pe_num_map[pdn->vf_index]; > + edev = pdn_to_eeh_dev(pdn); > > /* > * The following operations will fail if VF's sysfs files > @@ -72,8 +82,10 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev) > */ > eeh_add_device_early(pdn); > eeh_add_device_late(pdev); > + edev->pe_config_addr = (pdn->busno << 16) | (pdn->devfn << 8); > + eeh_rmv_from_parent_pe(edev); /* Remove as it is adding to bus pe */ > + eeh_add_to_parent_pe(edev); /* Add as VF PE type */ > eeh_sysfs_add_device(pdev); > - While we are here - unrelated empty line removal here and in other patches of this patchset. > } > > /* >
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 9f66ddebb799..16d70740a76f 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -211,7 +211,10 @@ struct pci_dn { unsigned int *pe_num_map; /* PE# for the first VF PE or array */ bool m64_single_mode; /* Use M64 BAR in Single Mode */ #define IODA_INVALID_M64 (-1) - int (*m64_map)[PCI_SRIOV_NUM_BARS]; + union { + int (*m64_map)[PCI_SRIOV_NUM_BARS]; /*Only used in powernv */ + int last_allow_rc; /* Only used in pSeries */ + }; #endif /* CONFIG_PCI_IOV */ int mps; /* Maximum Payload Size */ struct list_head child_list; diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c index a671ef4f57f5..686e9c7feab5 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c @@ -58,6 +58,8 @@ static int ibm_configure_pe; void pseries_pcibios_bus_add_device(struct pci_dev *pdev) { struct pci_dn *pdn = pci_get_pdn(pdev); + struct pci_dn *physfn_pdn; + struct eeh_dev *edev; if (!pdev->is_virtfn) return; @@ -65,6 +67,14 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev) pdn->device_id = pdev->device; pdn->vendor_id = pdev->vendor; pdn->class_code = pdev->class; + /* Last allow unfreeze return code used for retrieval + * by user space in eeh-sysfs to show the last command + * completion from platform + */ + pdn->last_allow_rc = 0; + physfn_pdn = pci_get_pdn(pdev->physfn); + pdn->pe_number = physfn_pdn->pe_num_map[pdn->vf_index]; + edev = pdn_to_eeh_dev(pdn); /* * The following operations will fail if VF's sysfs files @@ -72,8 +82,10 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev) */ eeh_add_device_early(pdn); eeh_add_device_late(pdev); + edev->pe_config_addr = (pdn->busno << 16) | (pdn->devfn << 8); + eeh_rmv_from_parent_pe(edev); /* Remove as it is adding to bus pe */ + eeh_add_to_parent_pe(edev); /* Add as VF PE type */ eeh_sysfs_add_device(pdev); - } /*