From: Dennis Dalessandro <dennis.dalessandro@intel.com>
To: bhelgaas@google.com, jgg@ziepe.ca, dledford@redhat.com
Cc: Sinan Kaya <okaya@codeaurora.org>,
"Michael J. Ruhl" <michael.j.ruhl@intel.com>,
linux-pci@vger.kernel.org, linux-rdma@vger.kernel.org
Subject: [PATCH for-rc 1/2] PCI: Fix faulty logic in pci_reset_bus()
Date: Fri, 31 Aug 2018 10:34:05 -0700 [thread overview]
Message-ID: <20180831173359.21741.61944.stgit@scvm10.sc.intel.com> (raw)
In-Reply-To: <20180831173132.21741.25892.stgit@scvm10.sc.intel.com>
The pci_rest_bus() function calls into pci_probe_reset_slot() to determine
whether to call the slot or bus reset. The check has faulty logic in that
it does not account for pci_probe_reset_slot() being able to return an
errno. Fix by only calling the slot reset when the function returns 0.
Treat < 1 and > 1 the same.
Cc: Sinan Kaya <okaya@codeaurora.org>
Fixes: 811c5cb37df4 ("PCI: Unify try slot and bus reset API")
Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
---
drivers/pci/pci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 29ff961..30b2603 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -5200,7 +5200,7 @@ static int __pci_reset_bus(struct pci_bus *bus)
*/
int pci_reset_bus(struct pci_dev *pdev)
{
- return pci_probe_reset_slot(pdev->slot) ?
+ return (!pci_probe_reset_slot(pdev->slot)) ?
__pci_reset_slot(pdev->slot) : __pci_reset_bus(pdev->bus);
}
EXPORT_SYMBOL_GPL(pci_reset_bus);
next prev parent reply other threads:[~2018-08-31 21:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 17:33 [PATCH for-rc 0/2] IB/hfi1: PCI bug due to pci core changes Dennis Dalessandro
2018-08-31 17:34 ` Dennis Dalessandro [this message]
2018-08-31 17:58 ` [PATCH for-rc 1/2] PCI: Fix faulty logic in pci_reset_bus() Sinan Kaya
2018-09-04 20:59 ` Jason Gunthorpe
2018-09-04 21:16 ` Sinan Kaya
2018-09-04 21:30 ` Jason Gunthorpe
2018-09-04 21:50 ` Sinan Kaya
2018-08-31 17:34 ` [PATCH for-rc 2/2] IB/hfi1,PCI: Allow bus reset while probing Dennis Dalessandro
2018-09-12 2:46 ` [PATCH for-rc 0/2] IB/hfi1: PCI bug due to pci core changes Bjorn Helgaas
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=20180831173359.21741.61944.stgit@scvm10.sc.intel.com \
--to=dennis.dalessandro@intel.com \
--cc=bhelgaas@google.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=michael.j.ruhl@intel.com \
--cc=okaya@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 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.