From: Gavin Shan <shangw@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
Subject: [PATCH 08/22] powerpc/eeh: Refactor eeh_reset_pe_once()
Date: Fri, 1 Mar 2013 22:17:06 +0800 [thread overview]
Message-ID: <1362147440-14096-9-git-send-email-shangw@linux.vnet.ibm.com> (raw)
In-Reply-To: <1362147440-14096-1-git-send-email-shangw@linux.vnet.ibm.com>
The patch changes the criteria used to judge if the PE has been
resetted successfully. We needn't the PE status is equal to the
combo: (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE).
Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
---
arch/powerpc/platforms/pseries/eeh.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 39d2ea6..ffe34c4 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -527,7 +527,6 @@ static void eeh_reset_pe_once(struct eeh_pe *pe)
* Partitionable Endpoint trumps hot-reset.
*/
eeh_pe_dev_traverse(pe, eeh_set_dev_freset, &freset);
-
if (freset)
eeh_ops->reset(pe, EEH_RESET_FUNDAMENTAL);
else
@@ -565,6 +564,7 @@ static void eeh_reset_pe_once(struct eeh_pe *pe)
*/
int eeh_reset_pe(struct eeh_pe *pe)
{
+ int flags = (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE);
int i, rc;
/* Take three shots at resetting the bus */
@@ -572,7 +572,7 @@ int eeh_reset_pe(struct eeh_pe *pe)
eeh_reset_pe_once(pe);
rc = eeh_ops->wait_state(pe, PCI_BUS_RESET_WAIT_MSEC);
- if (rc == (EEH_STATE_MMIO_ACTIVE | EEH_STATE_DMA_ACTIVE))
+ if ((rc & flags) == flags)
return 0;
if (rc < 0) {
--
1.7.5.4
next prev parent reply other threads:[~2013-03-01 14:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 14:16 [PATCH v1 0/22] EEH support for PowerNV platform Gavin Shan
2013-03-01 14:16 ` [PATCH 01/22] powerpc/eeh: Enhance converting EEH dev Gavin Shan
2013-03-01 14:17 ` [PATCH 02/22] powerpc/eeh: Function to tranverse PCI devices Gavin Shan
2013-03-01 14:17 ` [PATCH 03/22] powerpc/eeh: Make eeh_phb_pe_get public Gavin Shan
2013-03-01 14:17 ` [PATCH 04/22] powerpc/eeh: Make eeh_pe_get public Gavin Shan
2013-03-01 14:17 ` [PATCH 05/22] powerpc/eeh: Trace PCI bus from PE Gavin Shan
2013-03-01 14:17 ` [PATCH 06/22] powerpc/eeh: Make eeh_init public Gavin Shan
2013-03-01 14:17 ` [PATCH 07/22] powerpc/eeh: EEH post initialization operation Gavin Shan
2013-03-01 14:17 ` Gavin Shan [this message]
2013-03-01 14:17 ` [PATCH 09/22] powerpc/eeh: Delay EEH probe during hotplug Gavin Shan
2013-03-01 14:17 ` [PATCH 10/22] powerpc/eeh: Differentiate EEH event Gavin Shan
2013-03-01 14:17 ` [PATCH 11/22] powerpc/eeh: Sync OPAL API with firmware Gavin Shan
2013-03-01 14:17 ` [PATCH 12/22] powerpc/eeh: EEH backend for P7IOC Gavin Shan
2013-03-01 14:17 ` [PATCH 13/22] powerpc/eeh: I/O chip post initialization Gavin Shan
2013-03-01 14:17 ` [PATCH 14/22] powerpc/eeh: I/O chip EEH enable option Gavin Shan
2013-03-01 14:17 ` [PATCH 15/22] powerpc/eeh: I/O chip EEH state retrieval Gavin Shan
2013-03-01 14:17 ` [PATCH 16/22] powerpc/eeh: I/O chip PE reset Gavin Shan
2013-03-01 14:17 ` [PATCH 17/22] powerpc/eeh: I/O chip PE log and bridge setup Gavin Shan
2013-03-01 14:17 ` [PATCH 18/22] powerpc/eeh: PowerNV EEH backends Gavin Shan
2013-03-01 14:17 ` [PATCH 19/22] powerpc/eeh: Initialization for PowerNV Gavin Shan
2013-03-01 14:17 ` [PATCH 20/22] powerpc/eeh: Enable EEH check for config access Gavin Shan
2013-03-01 14:17 ` [PATCH 21/22] powerpc/eeh: Process interrupts caused by EEH Gavin Shan
2013-03-01 14:17 ` [PATCH 22/22] powerpc/eeh: Connect EEH error interrupt handle Gavin Shan
-- strict thread matches above, loose matches on Subject: below --
2013-05-15 3:34 [PATCH v1 00/22] powerpc/eeh: Enhance converting EEH dev Gavin Shan
2013-05-15 3:34 ` [PATCH 08/22] powerpc/eeh: Refactor eeh_reset_pe_once() Gavin Shan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362147440-14096-9-git-send-email-shangw@linux.vnet.ibm.com \
--to=shangw@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).