aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Shan <gwshan@linux.vnet.ibm.com>2015-10-07 23:58:55 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-10-21 05:41:43 -0400
commit872ee2d6528188c1de942dff5688f55578c1b989 (patch)
tree5fc1d31fa25ea85a33162b2b52fa02dac127c65c
parent8234fcedf18debbae0b8b06a5c70def5169c146c (diff)
powerpc/eeh: More relaxed condition for enabled IO path
When one or both of the below two flags are marked in the PE state, the PE's IO path is regarded as enabled: EEH_STATE_MMIO_ACTIVE or EEH_STATE_MMIO_ENABLED. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/eeh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 893978c980da..40e4d4a27663 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -631,7 +631,7 @@ int eeh_pci_enable(struct eeh_pe *pe, int function)
631 */ 631 */
632 switch (function) { 632 switch (function) {
633 case EEH_OPT_THAW_MMIO: 633 case EEH_OPT_THAW_MMIO:
634 active_flag = EEH_STATE_MMIO_ACTIVE; 634 active_flag = EEH_STATE_MMIO_ACTIVE | EEH_STATE_MMIO_ENABLED;
635 break; 635 break;
636 case EEH_OPT_THAW_DMA: 636 case EEH_OPT_THAW_DMA:
637 active_flag = EEH_STATE_DMA_ACTIVE; 637 active_flag = EEH_STATE_DMA_ACTIVE;