Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b85743ee authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files

powerpc/eeh: Refactor eeh_reset_pe() 



The patch refactors eeh_reset_pe() in order for:

   * Varied return values for different failure cases.
   * Replace pr_err() with pr_warn() and print function name.
   * Coding style cleanup.

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 35891d40

arch/powerpc/kernel/eeh.c

+18 −11
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static void eeh_reset_pe_once(struct eeh_pe *pe) 
int eeh_reset_pe(struct eeh_pe *pe)

{

	int flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);

	int i, rc;

	int i, state, ret;



	/* Take three shots at resetting the bus */

	for (i = 0; i < 3; i++) {
@@ -768,20 +768,27 @@ int eeh_reset_pe(struct eeh_pe *pe) 
		 * EEH_PE_ISOLATED is expected to be removed after

		 * BAR restore.

		 */

		rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);

		if ((rc & flags) == flags)

			return 0;

		state = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);

		if ((state & flags) == flags) {

			ret = 0;

			goto out;

		}



		if (rc < 0) {

			pr_err("%s: Unrecoverable slot failure on PHB#%d-PE#%x",

		if (state < 0) {

			pr_warn("%s: Unrecoverable slot failure on PHB#%d-PE#%x",

				__func__, pe->phb->global_number, pe->addr);

			return -1;

			ret = -ENOTRECOVERABLE;

			goto out;

		}

		pr_err("EEH: bus reset %d failed on PHB#%d-PE#%x, rc=%d\n",

			i+1, pe->phb->global_number, pe->addr, rc);



		/* We might run out of credits */

		ret = -EIO;

		pr_warn("%s: Failure %d resetting PHB#%x-PE#%x\n (%d)\n",

			__func__, state, pe->phb->global_number, pe->addr, (i + 1));

	}



	return -1;

out:

	return ret;

}



/**