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

Commit fbce44d0 authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman
Browse files

powerpc/powernv: Call opal_pci_poll() if needed 



When issuing PHB reset, OPAL API opal_pci_poll() is called to drive
the state machine in OPAL forward. However, we needn't always call
the function under some circumstances like reset deassert.

This avoids calling opal_pci_poll() when OPAL_SUCCESS is returned
from opal_pci_reset(). Except the overhead introduced by additional
one unnecessary OPAL call, I didn't run into real issue because of
this.

Reported-by: default avatarPridhiviraj Paidipeddi <ppaiddipe@in.ibm.com>
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c762c69e

arch/powerpc/platforms/powernv/eeh-powernv.c

+4 −2
Original line number Diff line number Diff line
@@ -763,6 +763,7 @@ int pnv_eeh_phb_reset(struct pci_controller *hose, int option) 
	 * reset followed by hot reset on root bus. So we also

	 * need the PCI bus settlement delay.

	 */

	if (rc > 0)

		rc = pnv_eeh_poll(phb->opal_id);

	if (option == EEH_RESET_DEACTIVATE) {

		if (system_state < SYSTEM_RUNNING)
@@ -806,6 +807,7 @@ static int pnv_eeh_root_reset(struct pci_controller *hose, int option) 
		goto out;



	/* Poll state of the PHB until the request is done */

	if (rc > 0)

		rc = pnv_eeh_poll(phb->opal_id);

	if (option == EEH_RESET_DEACTIVATE)

		msleep(EEH_PE_RST_SETTLE_TIME);