From: Sinan Kaya <okaya@codeaurora.org>
To: linux-pci@vger.kernel.org, sulrich@codeaurora.org, timur@codeaurora.org
Cc: Keith Busch <keith.busch@intel.com>,
Tyler Baicar <tbaicar@codeaurora.org>,
"Juan J. Alvarez" <jjalvare@linux.vnet.ibm.com>,
Gabriele Paoloni <gabriele.paoloni@huawei.com>,
Frederick Lawler <fred@fredlawl.com>,
linux-arm-msm@vger.kernel.org, Russell Currey <ruscur@russell.cc>,
open list <linux-kernel@vger.kernel.org>,
Sinan Kaya <okaya@codeaurora.org>,
"Bryant G. Ly" <bryantly@linux.vnet.ibm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bjorn Helgaas <bhelgaas@google.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] PCI/AER: Try slot reset before secondary bus reset
Date: Thu, 19 Apr 2018 15:56:24 -0400 [thread overview]
Message-ID: <1524167784-5911-2-git-send-email-okaya@codeaurora.org> (raw)
In-Reply-To: <1524167784-5911-1-git-send-email-okaya@codeaurora.org>
The endpoint observing AER_FATAL error might be connected to a PCI hotplug
slot. Performing secondary bus reset on a hotplug slot causes PCI link
up/down interrupts.
Hotplug driver removes the device from system when a link down interrupt
is observed and performs re-enumeration when link up interrupt is observed.
This conflicts with what this code is trying to do. Try secondary bus
reset only if pci_reset_slot() fails/unsupported.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/pci/pcie/aer/aerdrv.c | 3 ++-
drivers/pci/pcie/aer/aerdrv_core.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 779b387..4eaa524 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -318,7 +318,8 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)
reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);
- pci_reset_bridge_secondary_bus(dev);
+ if (pci_reset_slot(dev->slot))
+ pci_reset_bridge_secondary_bus(dev);
pci_printk(KERN_DEBUG, dev, "Root Port link has been reset\n");
/* Clear Root Error Status */
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 0ea5acc..a915b0e6 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -407,7 +407,8 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,
*/
static pci_ers_result_t default_reset_link(struct pci_dev *dev)
{
- pci_reset_bridge_secondary_bus(dev);
+ if (pci_reset_slot(dev->slot))
+ pci_reset_bridge_secondary_bus(dev);
pci_printk(KERN_DEBUG, dev, "downstream link has been reset\n");
return PCI_ERS_RESULT_RECOVERED;
}
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-04-19 19:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 19:56 [PATCH 1/2] IB/hfi1: Try slot reset before secondary bus reset Sinan Kaya
2018-04-19 19:56 ` Sinan Kaya [this message]
2018-04-27 18:51 ` [PATCH 2/2] PCI/AER: " Sinan Kaya
2018-04-19 20:26 ` [PATCH 1/2] IB/hfi1: " Jason Gunthorpe
2018-04-19 20:35 ` Sinan Kaya
2018-04-19 21:47 ` Bjorn Helgaas
2018-04-19 22:11 ` Deucher, Alexander
2018-04-20 14:12 ` Dennis Dalessandro
2018-04-20 14:55 ` Jason Gunthorpe
2018-04-19 22:19 ` Sinan Kaya
2018-04-20 14:00 ` Bjorn Helgaas
2018-04-20 14:23 ` Sinan Kaya
2018-04-20 15:04 ` Alex Williamson
2018-04-23 17:28 ` Sinan Kaya
2018-04-23 19:10 ` Alex Williamson
2018-04-23 20:17 ` Sinan Kaya
2018-04-23 20:23 ` Bjorn Helgaas
2018-04-23 20:41 ` Alex Williamson
2018-04-25 14:13 ` Sinan Kaya
2018-04-20 14:54 ` Jason Gunthorpe
2018-06-19 21:43 ` Bjorn Helgaas
2018-06-19 22:21 ` Sinan Kaya
2018-06-22 14:01 ` Bjorn Helgaas
2018-06-22 16:04 ` Sinan Kaya
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=1524167784-5911-2-git-send-email-okaya@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=bhelgaas@google.com \
--cc=bryantly@linux.vnet.ibm.com \
--cc=fred@fredlawl.com \
--cc=gabriele.paoloni@huawei.com \
--cc=gregkh@linuxfoundation.org \
--cc=jjalvare@linux.vnet.ibm.com \
--cc=keith.busch@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=ruscur@russell.cc \
--cc=sulrich@codeaurora.org \
--cc=tbaicar@codeaurora.org \
--cc=timur@codeaurora.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).