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

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

powerpc/eeh: Refactor eeh_reset_pe_once() 



We shouldn't check that the returned PE status is exactly equal to
(EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE) but instead only check
that they are both set.

[benh: changelog]
Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 21fd21f5

arch/powerpc/kernel/eeh.c

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



	/* Take three shots at resetting the bus */
@@ -572,7 +573,7 @@ int eeh_reset_pe(struct eeh_pe *pe) 
		eeh_reset_pe_once(pe);



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

		if (rc == (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE))

		if ((rc & flags) == flags)

			return 0;



		if (rc < 0) {