From: Ding Tianhong <dingtianhong@huawei.com>
To: <leedom@chelsio.com>, <ashok.raj@intel.com>,
<bhelgaas@google.com>, <helgaas@kernel.org>, <werner@chelsio.com>,
<ganeshgr@chelsio.com>, <asit.k.mallick@intel.com>,
<patrick.j.cramer@intel.com>, <Suravee.Suthikulpanit@amd.com>,
<Bob.Shaw@amd.com>, <l.stach@pengutronix.de>,
<amira@mellanox.com>, <gabriele.paoloni@huawei.com>,
<David.Laight@aculab.com>, <jeffrey.t.kirsher@intel.com>,
<catalin.marinas@arm.com>, <will.deacon@arm.com>,
<mark.rutland@arm.com>, <robin.murphy@arm.com>,
<davem@davemloft.net>, <alexander.duyck@gmail.com>,
<eric.dumazet@gmail.com>, <linux-arm-kernel@lists.infradead.org>,
<netdev@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>
Cc: Ding Tianhong <dingtianhong@huawei.com>,
Thierry Reding <thierry.reding@gmail.com>
Subject: [PATCH net] PCI: fix the return value for the pci_find_pcie_root_port()
Date: Thu, 17 Aug 2017 10:25:30 +0800 [thread overview]
Message-ID: <1502936730-7368-1-git-send-email-dingtianhong@huawei.com> (raw)
The pci_find_pcie_root_port() would return NULL if the given
dev is already a Root Port, it looks like unfriendly to the
PCIe Root Port device, Thierry and Bjorn suggest to let this
function return the given dev under this circumstances.
Fixes: 0e405232871d6 ("PCI: fix oops when try to find Root Port for a PCI device")
Suggested-by: Thierry Reding <thierry.reding@gmail.com>
Suggested-by: Bjorn Helgaas <helgaas@kernel.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
---
drivers/pci/pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 7e2022f..352bb53 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -514,7 +514,7 @@ struct resource *pci_find_resource(struct pci_dev *dev, struct resource *res)
*/
struct pci_dev *pci_find_pcie_root_port(struct pci_dev *dev)
{
- struct pci_dev *bridge, *highest_pcie_bridge = NULL;
+ struct pci_dev *bridge, *highest_pcie_bridge = dev;
bridge = pci_upstream_bridge(dev);
while (bridge && pci_is_pcie(bridge)) {
--
1.8.3.1
next reply other threads:[~2017-08-17 2:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 2:25 Ding Tianhong [this message]
2017-08-17 2:42 ` [PATCH net] PCI: fix the return value for the pci_find_pcie_root_port() David Miller
2017-08-17 10:51 ` Thierry Reding
2017-08-17 12:40 ` Ding Tianhong
2017-08-17 13:30 ` Thierry Reding
2017-08-17 13:38 ` Ding Tianhong
2017-08-17 11:06 ` [PATCH] PCI: Allow PCI express root ports to find themselves Thierry Reding
2017-08-17 16:58 ` Bjorn Helgaas
2017-08-18 1:29 ` Shawn Lin
2017-08-18 4:32 ` Michael Ellerman
2017-08-18 23:14 ` David Miller
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=1502936730-7368-1-git-send-email-dingtianhong@huawei.com \
--to=dingtianhong@huawei.com \
--cc=Bob.Shaw@amd.com \
--cc=David.Laight@aculab.com \
--cc=Suravee.Suthikulpanit@amd.com \
--cc=alexander.duyck@gmail.com \
--cc=amira@mellanox.com \
--cc=ashok.raj@intel.com \
--cc=asit.k.mallick@intel.com \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=gabriele.paoloni@huawei.com \
--cc=ganeshgr@chelsio.com \
--cc=helgaas@kernel.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=l.stach@pengutronix.de \
--cc=leedom@chelsio.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=patrick.j.cramer@intel.com \
--cc=robin.murphy@arm.com \
--cc=thierry.reding@gmail.com \
--cc=werner@chelsio.com \
--cc=will.deacon@arm.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 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).