powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE

Gavin Shan · mpe · commit 360d88a9e3fb · 2014-11-27T09:40:32.000+11:00
The flag passed to ioda_eeh_phb_reset() should be EEH_RESET_DEACTIVATE,
which is translated to OPAL_DEASSERT_RESET or something else by the
EEH backend accordingly.

The patch replaces OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE for
ioda_eeh_phb_reset().

Cc: stable@vger.kernel.org
Signed-off-by: Gavin Shan &lt;gwshan@linux.vnet.ibm.com&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1997,7 +1997,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
 	if (is_kdump_kernel()) {
 		pr_info("  Issue PHB reset ...\n");
 		ioda_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL);
-		ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET);
+		ioda_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE);
 	}
 
 	/* Configure M64 window */

Original file line number	Diff line number	Diff line change
`@@ -1997,7 +1997,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,`
`1997`	`1997`	`if (is_kdump_kernel()) {`
`1998`	`1998`	`pr_info(" Issue PHB reset ...\n");`
`1999`	`1999`	`ioda_eeh_phb_reset(hose, EEH_RESET_FUNDAMENTAL);`
`2000`		`- ioda_eeh_phb_reset(hose, OPAL_DEASSERT_RESET);`
	`2000`	`+ ioda_eeh_phb_reset(hose, EEH_RESET_DEACTIVATE);`
`2001`	`2001`	`}`
`2002`	`2002`
`2003`	`2003`	`/* Configure M64 window */`