diff options
| author | Gavin Shan | 2014-09-30 04:39:02 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2014-09-30 09:15:14 +0200 |
| commit | c9dd0143978e1c473c08dafe8156259b895db3e2 (patch) | |
| tree | c22ed5343c6b7d6b542a1dbe3fa79a1a48665063 /arch/powerpc/kernel/eeh.c | |
| parent | powerpc/eeh: Unfreeze PE on enabling EEH functionality (diff) | |
| download | kernel-qcow2-linux-c9dd0143978e1c473c08dafe8156259b895db3e2.tar.gz kernel-qcow2-linux-c9dd0143978e1c473c08dafe8156259b895db3e2.tar.xz kernel-qcow2-linux-c9dd0143978e1c473c08dafe8156259b895db3e2.zip | |
powerpc/eeh: Use eeh_unfreeze_pe()
The patch uses eeh_unfreeze_pe() to replace the logic clearing
frozen IO and DMA, in order to simplify the code.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index b569ce2a8037..c79583fe1905 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1433,24 +1433,7 @@ static int eeh_pe_reenable_devices(struct eeh_pe *pe) } /* The PE is still in frozen state */ - ret = eeh_ops->set_option(pe, EEH_OPT_THAW_MMIO); - if (ret) { - pr_warn("%s: Failure %d enabling MMIO for PHB#%x-PE#%x\n", - __func__, ret, pe->phb->global_number, pe->addr); - return ret; - } - - ret = eeh_ops->set_option(pe, EEH_OPT_THAW_DMA); - if (ret) { - pr_warn("%s: Failure %d enabling DMA for PHB#%x-PE#%x\n", - __func__, ret, pe->phb->global_number, pe->addr); - return ret; - } - - /* Clear software isolated state */ - eeh_pe_state_clear(pe, EEH_PE_ISOLATED); - - return ret; + return eeh_unfreeze_pe(pe, true); } /** |