diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-11-25 01:26:59 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-12-10 20:15:31 +0300 |
| commit | c5daf42396978d072242ecede3e52dc135409139 (patch) | |
| tree | 91b6b6c6e6b2ae84b0ab015042c7717db9fb20b0 | |
| parent | 5b1b543babef45091c56762d3904ac87290b06df (diff) | |
| download | linux-c5daf42396978d072242ecede3e52dc135409139.tar.xz | |
powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE
commit 360d88a9e3fba596a12520b242fbab1c45b983e1 upstream.
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().
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index dc30aa5a2ce8..c339a2fbdf0b 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1403,7 +1403,7 @@ 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); } } |