Linux PCI subsystem development
 help / color / mirror / Atom feed
From: Rui He <rui.he@windriver.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<Prashant.Chikhalkar@windriver.com>, <Jiguang.Xiao@windriver.com>,
	<Rui.He@windriver.com>
Subject: [PATCH 1/1] pci: Add subordinate check before pci_add_new_bus()
Date: Thu, 14 Aug 2025 17:39:37 +0800	[thread overview]
Message-ID: <20250814093937.2372441-1-rui.he@windriver.com> (raw)

For preconfigured PCI bridge, child bus created on the first scan.
While for some reasons(e.g register mutation), the secondary, and subordiante
register reset to 0 on the second scan, which caused to create
PCI bus twice for the same PCI device.

Following is the related log:
[Wed May 28 20:38:36 CST 2025] pci 0000:0b:01.0: PCI bridge to [bus 0d]
[Wed May 28 20:38:36 CST 2025] pci 0000:0b:05.0: bridge configuration invalid ([bus 00-00]), reconfiguring
[Wed May 28 20:38:36 CST 2025] pci 0000:0b:01.0: PCI bridge to [bus 0e-10]
[Wed May 28 20:38:36 CST 2025] pci 0000:0b:05.0: PCI bridge to [bus 0f-10]

Here PCI device 000:0b:01.0 assigend to bus 0d and 0e.

This patch checks if child PCI bus has been created on the second scan
of bridge. If yes, return directly instead of create a new one.

Signed-off-by: Rui He <rui.he@windriver.com>
---
 drivers/pci/probe.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f41128f91ca76..ec67adbf31738 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1444,6 +1444,9 @@ static int pci_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev,
 			goto out;
 		}
 
+		if(pci_has_subordinate(dev))
+			goto out;
+
 		/* Clear errors */
 		pci_write_config_word(dev, PCI_STATUS, 0xffff);
 
-- 
2.43.0


             reply	other threads:[~2025-08-14  9:39 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-14  9:39 Rui He [this message]
2025-08-14 20:36 ` [PATCH 1/1] pci: Add subordinate check before pci_add_new_bus() Bjorn Helgaas
2025-08-15  2:31   ` He, Rui
2025-08-15 14:22     ` Bjorn Helgaas
2025-08-26  7:01       ` He, Rui
2025-08-17  2:46 ` Ethan Zhao
2025-08-25  8:47   ` He, Rui

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=20250814093937.2372441-1-rui.he@windriver.com \
    --to=rui.he@windriver.com \
    --cc=Jiguang.Xiao@windriver.com \
    --cc=Prashant.Chikhalkar@windriver.com \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.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