iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/pseries: Set eeh_pe of EEH_PE_VF type

Browse Source 
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>
Acked-by: Russell Currey <ruscur@russell.cc>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Bryant G. Ly 2018-01-05 10:45:48 -06:00 committed by Michael Ellerman
parent 856e1eb9bd
commit 565a744dd2
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/include/asm/pci-bridge.h
View File

@ -211,7 +211,8 @@ struct pci_dn {
unsigned int *pe_num_map; /* PE# for the first VF PE or array */ unsigned int *pe_num_map; /* PE# for the first VF PE or array */
bool m64_single_mode; /* Use M64 BAR in Single Mode */ bool m64_single_mode; /* Use M64 BAR in Single Mode */
#define IODA_INVALID_M64 (-1) #define IODA_INVALID_M64 (-1)
int (*m64_map)[PCI_SRIOV_NUM_BARS]; int (*m64_map)[PCI_SRIOV_NUM_BARS]; /* Only used on powernv */
int last_allow_rc; /* Only used on pseries */
#endif /* CONFIG_PCI_IOV */ #endif /* CONFIG_PCI_IOV */
int mps; /* Maximum Payload Size */ int mps; /* Maximum Payload Size */
struct list_head child_list; struct list_head child_list;

18
arch/powerpc/platforms/pseries/eeh_pseries.c
View File

@ -55,9 +55,12 @@ static int ibm_get_config_addr_info;
static int ibm_get_config_addr_info2; static int ibm_get_config_addr_info2;
static int ibm_configure_pe; static int ibm_configure_pe;
#ifdef CONFIG_PCI_IOV
void pseries_pcibios_bus_add_device(struct pci_dev *pdev) void pseries_pcibios_bus_add_device(struct pci_dev *pdev)
{ {
struct pci_dn *pdn = pci_get_pdn(pdev); struct pci_dn *pdn = pci_get_pdn(pdev);
struct pci_dn *physfn_pdn;
struct eeh_dev *edev;
if (!pdev->is_virtfn) if (!pdev->is_virtfn)
return; return;
@ -65,6 +68,15 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev)
pdn->device_id = pdev->device; pdn->device_id = pdev->device;
pdn->vendor_id = pdev->vendor; pdn->vendor_id = pdev->vendor;
pdn->class_code = pdev->class; 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 * The following operations will fail if VF's sysfs files
@ -72,9 +84,13 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev)
*/ */
eeh_add_device_early(pdn); eeh_add_device_early(pdn);
eeh_add_device_late(pdev); 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); eeh_sysfs_add_device(pdev);
} }
#endif
/* /*
* Buffer for reporting slot-error-detail rtas calls. Its here * Buffer for reporting slot-error-detail rtas calls. Its here
@ -141,8 +157,10 @@ static int pseries_eeh_init(void)
/* Set EEH probe mode */ /* Set EEH probe mode */
eeh_add_flag(EEH_PROBE_MODE_DEVTREE | EEH_ENABLE_IO_FOR_LOG); eeh_add_flag(EEH_PROBE_MODE_DEVTREE | EEH_ENABLE_IO_FOR_LOG);
#ifdef CONFIG_PCI_IOV
/* Set EEH machine dependent code */ /* Set EEH machine dependent code */
ppc_md.pcibios_bus_add_device = pseries_pcibios_bus_add_device; ppc_md.pcibios_bus_add_device = pseries_pcibios_bus_add_device;
#endif
return 0; return 0;
} }