mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 05:34:13 +08:00
powerpc/eeh: Rename eeh_{add_to|remove_from}_parent_pe()
The naming of eeh_{add_to|remove_from}_parent_pe() doesn't really reflect what they actually do. If the PE referred to be edev->pe_config_addr already exists under that PHB then the edev is added to that PE. However, if the PE doesn't exist the a new one is created for the edev. The bulk of the implementation of eeh_add_to_parent_pe() covers that second case. Similarly, most of eeh_remove_from_parent_pe() is determining when it's safe to delete a PE. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200725081231.39076-12-oohall@gmail.com
This commit is contained in:
parent
768a42845b
commit
d923ab7a96
@ -283,8 +283,8 @@ struct eeh_pe *eeh_phb_pe_get(struct pci_controller *phb);
|
||||
struct eeh_pe *eeh_pe_next(struct eeh_pe *pe, struct eeh_pe *root);
|
||||
struct eeh_pe *eeh_pe_get(struct pci_controller *phb,
|
||||
int pe_no, int config_addr);
|
||||
int eeh_add_to_parent_pe(struct eeh_dev *edev);
|
||||
int eeh_rmv_from_parent_pe(struct eeh_dev *edev);
|
||||
int eeh_pe_tree_insert(struct eeh_dev *edev);
|
||||
int eeh_pe_tree_remove(struct eeh_dev *edev);
|
||||
void eeh_pe_update_time_stamp(struct eeh_pe *pe);
|
||||
void *eeh_pe_traverse(struct eeh_pe *root,
|
||||
eeh_pe_traverse_func fn, void *flag);
|
||||
|
@ -1107,7 +1107,7 @@ void eeh_probe_device(struct pci_dev *dev)
|
||||
* FIXME: HEY MA, LOOK AT ME, NO LOCKING!
|
||||
*/
|
||||
if (edev->pdev && edev->pdev != dev) {
|
||||
eeh_rmv_from_parent_pe(edev);
|
||||
eeh_pe_tree_remove(edev);
|
||||
eeh_addr_cache_rmv_dev(edev->pdev);
|
||||
eeh_sysfs_remove_device(edev->pdev);
|
||||
|
||||
@ -1186,7 +1186,7 @@ void eeh_remove_device(struct pci_dev *dev)
|
||||
edev->in_error = false;
|
||||
dev->dev.archdata.edev = NULL;
|
||||
if (!(edev->pe->state & EEH_PE_KEEP))
|
||||
eeh_rmv_from_parent_pe(edev);
|
||||
eeh_pe_tree_remove(edev);
|
||||
else
|
||||
edev->mode |= EEH_DEV_DISCONNECTED;
|
||||
}
|
||||
|
@ -542,7 +542,7 @@ static void *eeh_pe_detach_dev(struct eeh_pe *pe, void *userdata)
|
||||
continue;
|
||||
|
||||
edev->mode &= ~(EEH_DEV_DISCONNECTED | EEH_DEV_IRQ_DISABLED);
|
||||
eeh_rmv_from_parent_pe(edev);
|
||||
eeh_pe_tree_remove(edev);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
@ -356,7 +356,7 @@ static struct eeh_pe *eeh_pe_get_parent(struct eeh_dev *edev)
|
||||
}
|
||||
|
||||
/**
|
||||
* eeh_add_to_parent_pe - Add EEH device to parent PE
|
||||
* eeh_pe_tree_insert - Add EEH device to parent PE
|
||||
* @edev: EEH device
|
||||
*
|
||||
* Add EEH device to the parent PE. If the parent PE already
|
||||
@ -364,7 +364,7 @@ static struct eeh_pe *eeh_pe_get_parent(struct eeh_dev *edev)
|
||||
* we have to create new PE to hold the EEH device and the new
|
||||
* PE will be linked to its parent PE as well.
|
||||
*/
|
||||
int eeh_add_to_parent_pe(struct eeh_dev *edev)
|
||||
int eeh_pe_tree_insert(struct eeh_dev *edev)
|
||||
{
|
||||
struct eeh_pe *pe, *parent;
|
||||
struct pci_dn *pdn = eeh_dev_to_pdn(edev);
|
||||
@ -459,7 +459,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)
|
||||
}
|
||||
|
||||
/**
|
||||
* eeh_rmv_from_parent_pe - Remove one EEH device from the associated PE
|
||||
* eeh_pe_tree_remove - Remove one EEH device from the associated PE
|
||||
* @edev: EEH device
|
||||
*
|
||||
* The PE hierarchy tree might be changed when doing PCI hotplug.
|
||||
@ -467,7 +467,7 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)
|
||||
* during EEH recovery. So we have to call the function remove the
|
||||
* corresponding PE accordingly if necessary.
|
||||
*/
|
||||
int eeh_rmv_from_parent_pe(struct eeh_dev *edev)
|
||||
int eeh_pe_tree_remove(struct eeh_dev *edev)
|
||||
{
|
||||
struct eeh_pe *pe, *parent, *child;
|
||||
bool keep, recover;
|
||||
|
@ -263,7 +263,7 @@ void remove_sriov_vf_pdns(struct pci_dev *pdev)
|
||||
* have a configured PE.
|
||||
*/
|
||||
if (edev->pe)
|
||||
eeh_rmv_from_parent_pe(edev);
|
||||
eeh_pe_tree_remove(edev);
|
||||
|
||||
pdn->edev = NULL;
|
||||
kfree(edev);
|
||||
|
@ -399,7 +399,7 @@ static struct eeh_dev *pnv_eeh_probe(struct pci_dev *pdev)
|
||||
edev->pe_config_addr = phb->ioda.pe_rmap[config_addr];
|
||||
|
||||
/* Create PE */
|
||||
ret = eeh_add_to_parent_pe(edev);
|
||||
ret = eeh_pe_tree_insert(edev);
|
||||
if (ret) {
|
||||
eeh_edev_warn(edev, "Failed to add device to PE (code %d)\n", ret);
|
||||
return NULL;
|
||||
|
@ -72,8 +72,8 @@ void pseries_pcibios_bus_add_device(struct pci_dev *pdev)
|
||||
struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
|
||||
|
||||
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_pe_tree_remove(edev); /* Remove as it is adding to bus pe */
|
||||
eeh_pe_tree_insert(edev); /* Add as VF PE type */
|
||||
}
|
||||
#endif
|
||||
eeh_probe_device(pdev);
|
||||
@ -482,14 +482,14 @@ void pseries_eeh_init_edev(struct pci_dn *pdn)
|
||||
|
||||
if (enable) {
|
||||
eeh_add_flag(EEH_ENABLED);
|
||||
eeh_add_to_parent_pe(edev);
|
||||
eeh_pe_tree_insert(edev);
|
||||
} else if (pdn->parent && pdn_to_eeh_dev(pdn->parent) &&
|
||||
(pdn_to_eeh_dev(pdn->parent))->pe) {
|
||||
/* This device doesn't support EEH, but it may have an
|
||||
* EEH parent, in which case we mark it as supported.
|
||||
*/
|
||||
edev->pe_config_addr = pdn_to_eeh_dev(pdn->parent)->pe_config_addr;
|
||||
eeh_add_to_parent_pe(edev);
|
||||
eeh_pe_tree_insert(edev);
|
||||
}
|
||||
eeh_edev_dbg(edev, "EEH is %s on device (code %d)\n",
|
||||
(enable ? "enabled" : "unsupported"), ret);
|
||||
|
Loading…
Reference in New Issue
Block a user