diff options
| author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-09-30 12:39:02 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-09-30 17:15:14 +1000 |
| commit | c9dd0143978e1c473c08dafe8156259b895db3e2 (patch) | |
| tree | c22ed5343c6b7d6b542a1dbe3fa79a1a48665063 /arch/powerpc/kernel/eeh_driver.c | |
| parent | 4eeeff0ebcdeabf3f76c4eece0593e98c6619be8 (diff) | |
| download | linux-stable-c9dd0143978e1c473c08dafe8156259b895db3e2.tar.gz linux-stable-c9dd0143978e1c473c08dafe8156259b895db3e2.tar.bz2 linux-stable-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_driver.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh_driver.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index 6a0dcee8e931..948e6f99089f 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -450,21 +450,15 @@ static void *eeh_pe_detach_dev(void *data, void *userdata) static void *__eeh_clear_pe_frozen_state(void *data, void *flag) { struct eeh_pe *pe = (struct eeh_pe *)data; - int i, rc; + int i, rc = 1; - for (i = 0; i < 3; i++) { - rc = eeh_pci_enable(pe, EEH_OPT_THAW_MMIO); - if (rc) - continue; - rc = eeh_pci_enable(pe, EEH_OPT_THAW_DMA); - if (!rc) - break; - } + for (i = 0; rc && i < 3; i++) + rc = eeh_unfreeze_pe(pe, false); - /* The PE has been isolated, clear it */ + /* Stop immediately on any errors */ if (rc) { - pr_warn("%s: Can't clear frozen PHB#%x-PE#%x (%d)\n", - __func__, pe->phb->global_number, pe->addr, rc); + pr_warn("%s: Failure %d unfreezing PHB#%x-PE#%x\n", + __func__, rc, pe->phb->global_number, pe->addr); return (void *)pe; } |