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

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

powerpc/powernv: Enable EEH for PHB3 



The EEH isn't enabled for PHB3 and the patch intends to enable it.

Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 81fafea6

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

+11 −15
Original line number Diff line number Diff line
@@ -106,14 +106,11 @@ static int ioda_eeh_post_init(struct pci_controller *hose) 
		ioda_eeh_nb_init = 1;

	}



	/* FIXME: Enable it for PHB3 later */

	if (phb->type == PNV_PHB_IODA1) {

	/* We needn't HUB diag-data on PHB3 */

	if (phb->type == PNV_PHB_IODA1 && !hub_diag) {

		hub_diag = (char *)__get_free_page(GFP_KERNEL | __GFP_ZERO);

		if (!hub_diag) {

			hub_diag = (char *)__get_free_page(GFP_KERNEL |

							   __GFP_ZERO);

			if (!hub_diag) {

				pr_err("%s: Out of memory !\n",

				       __func__);

			pr_err("%s: Out of memory !\n", __func__);

			return -ENOMEM;

		}

	}
@@ -126,7 +123,6 @@ static int ioda_eeh_post_init(struct pci_controller *hose) 
#endif



	phb->eeh_state |= PNV_EEH_STATE_ENABLED;

	}



	return 0;

}

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

+1 −4
Original line number Diff line number Diff line
@@ -144,10 +144,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag) 
	/*

	 * Enable EEH explicitly so that we will do EEH check

	 * while accessing I/O stuff

	 *

	 * FIXME: Enable that for PHB3 later

	 */

	if (phb->type == PNV_PHB_IODA1)

	eeh_subsystem_enabled = 1;



	/* Save memory bars */