evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc/powernv: Enable EEH for PHB3

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

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Gavin Shan 2013-09-06 09:00:00 +08:00 • committed by Benjamin Herrenschmidt
parent 81fafea67a
commit 20bb842b9b
2 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/powerpc/platforms/powernv/eeh-ioda.c
View file

@ -106,14 +106,11 @@ static int ioda_eeh_post_init(struct pci_controller *hose)
ioda_eeh_nb_init = 1; ioda_eeh_nb_init = 1;
} }
/* FIXME: Enable it for PHB3 later */ /* We needn't HUB diag-data on PHB3 */
if (phb->type == PNV_PHB_IODA1) { if (phb->type == PNV_PHB_IODA1 && !hub_diag) {
hub_diag = (char *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
if (!hub_diag) { if (!hub_diag) {
hub_diag = (char *)__get_free_page(GFP_KERNEL | pr_err("%s: Out of memory !\n", __func__);
__GFP_ZERO);
if (!hub_diag) {
pr_err("%s: Out of memory !\n",
__func__);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -126,7 +123,6 @@ static int ioda_eeh_post_init(struct pci_controller *hose)
#endif #endif
phb->eeh_state |= PNV_EEH_STATE_ENABLED; phb->eeh_state |= PNV_EEH_STATE_ENABLED;
}
return 0; return 0;
} }

3
arch/powerpc/platforms/powernv/eeh-powernv.c
View file

@ -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 * Enable EEH explicitly so that we will do EEH check
* while accessing I/O stuff * while accessing I/O stuff
*
* FIXME: Enable that for PHB3 later
*/ */
if (phb->type == PNV_PHB_IODA1)
eeh_subsystem_enabled = 1; eeh_subsystem_enabled = 1;
/* Save memory bars */ /* Save memory bars */