All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ethan Zhao <haifeng.zhao@intel.com>
To: bhelgaas@google.com, oohall@gmail.com, ruscur@russell.cc,
	lukas@wunner.de, andriy.shevchenko@linux.intel.com,
	stuart.w.hayes@gmail.com, mr.nuke.me@gmail.com,
	mika.westerberg@linux.intel.com
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	pei.p.jia@intel.com, Ethan Zhao <haifeng.zhao@intel.com>
Subject: [PATCH 5/5] PCI/ERR: don't mix io state not changed and no driver together
Date: Thu, 24 Sep 2020 22:34:23 -0400	[thread overview]
Message-ID: <20200925023423.42675-6-haifeng.zhao@intel.com> (raw)
In-Reply-To: <20200925023423.42675-1-haifeng.zhao@intel.com>

When we see 'can't recover (no error_detected callback)' on console,
Maybe the reason is io state is not changed by calling
pci_dev_set_io_state(), that is confused. fix it.

Signed-off-by: Ethan Zhao <haifeng.zhao@intel.com>
Tested-by: Wen jin <wen.jin@intel.com>
Tested-by: Shanshan Zhang <ShanshanX.Zhang@intel.com>
---
 drivers/pci/pcie/err.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c
index e35c4480c86b..d85f27c90c26 100644
--- a/drivers/pci/pcie/err.c
+++ b/drivers/pci/pcie/err.c
@@ -55,8 +55,10 @@ static int report_error_detected(struct pci_dev *dev,
 	if (!pci_dev_get(dev))
 		return 0;
 	device_lock(&dev->dev);
-	if (!pci_dev_set_io_state(dev, state) ||
-		!dev->driver ||
+	if (!pci_dev_set_io_state(dev, state)) {
+		pci_dbg(dev, "Device might already being in error handling ...\n");
+		vote = PCI_ERS_RESULT_NONE;
+	} else if (!dev->driver ||
 		!dev->driver->err_handler ||
 		!dev->driver->err_handler->error_detected) {
 		/*
-- 
2.18.4


  parent reply	other threads:[~2020-09-25  2:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-25  2:34 [PATCH 0/5] Fix DPC hotplug race and enhance error hanlding Ethan Zhao
2020-09-25  2:34 ` [PATCH 4/5] PCI: only return true when dev io state is really changed Ethan Zhao
2020-09-25 12:38   ` Andy Shevchenko
2020-09-27  1:28     ` Zhao, Haifeng
2020-09-25 13:56   ` Alex G.
2020-09-25  2:34 ` Ethan Zhao [this message]
     [not found] ` <20200925023423.42675-2-haifeng.zhao@intel.com>
2020-09-25 12:24   ` [PATCH 1/5] PCI: define a function to check and wait till port finish DPC handling Andy Shevchenko
2020-09-27  1:53     ` Zhao, Haifeng
     [not found] ` <20200925023423.42675-3-haifeng.zhao@intel.com>
2020-09-25 12:32   ` [PATCH 2/5] PCI: pciehp: check and wait port status out of DPC before handling DLLSC and PDC Andy Shevchenko
2020-09-27  1:50     ` Zhao, Haifeng
     [not found] ` <20200925023423.42675-4-haifeng.zhao@intel.com>
2020-09-25 12:35   ` [PATCH 3/5] PCI/ERR: get device before call device driver to avoid null pointer reference Andy Shevchenko
2020-09-29  2:35     ` Ethan Zhao
2020-09-29  8:51       ` Andy Shevchenko
2020-09-29  9:38         ` Ethan Zhao
2020-09-29 10:48           ` Andy Shevchenko
2020-09-30  2:07             ` Ethan Zhao

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=20200925023423.42675-6-haifeng.zhao@intel.com \
    --to=haifeng.zhao@intel.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lukas@wunner.de \
    --cc=mika.westerberg@linux.intel.com \
    --cc=mr.nuke.me@gmail.com \
    --cc=oohall@gmail.com \
    --cc=pei.p.jia@intel.com \
    --cc=ruscur@russell.cc \
    --cc=stuart.w.hayes@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.