Commit d923ab7a authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

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: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200725081231.39076-12-oohall@gmail.com
parent 768a4284

arch/powerpc/include/asm/eeh.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/kernel/eeh.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

arch/powerpc/kernel/eeh_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/kernel/eeh_pe.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/kernel/pci_dn.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE