From: Koichiro Den <den@valinux.co.jp>
To: ntb@lists.linux.dev, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, Frank.Li@nxp.com
Cc: jdmason@kudzu.us, dave.jiang@intel.com, allenbh@gmail.com,
mani@kernel.org, kwilczynski@kernel.org, kishon@kernel.org,
bhelgaas@google.com, jbrunet@baylibre.com, lpieralisi@kernel.org,
yebin10@huawei.com, geert+renesas@glider.be, arnd@arndb.de,
stable@vger.kernel.org
Subject: [PATCH v3 6/7] PCI: endpoint: pci-epf-vntb: Switch vpci_scan_bus() to use pci_scan_root_bus()
Date: Mon, 1 Dec 2025 00:10:59 +0900 [thread overview]
Message-ID: <20251130151100.2591822-7-den@valinux.co.jp> (raw)
In-Reply-To: <20251130151100.2591822-1-den@valinux.co.jp>
vpci_scan_bus() currently uses pci_scan_bus(), which creates a root bus
without a parent struct device. In a subsequent change we want to tear
down the virtual PCI root bus using pci_remove_root_bus(). For that to
work correctly, the root bus must be associated with a parent device,
similar to what the removed pci_scan_bus_parented() helper used to do.
Switch vpci_scan_bus() to use pci_scan_root_bus() and pass
&ndev->epf->epc->dev as the parent. Build the resource list in the same
way as pci_scan_bus(), so the behavior is unchanged except that the
virtual root bus now has a proper parent device. This avoids crashes in
the pci_epf_unbind() -> epf_ntb_unbind() -> pci_remove_root_bus() ->
pci_bus_release_domain_nr() path once we start removing the root bus in
a follow-up patch.
Signed-off-by: Koichiro Den <den@valinux.co.jp>
---
drivers/pci/endpoint/functions/pci-epf-vntb.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 750a246f79c9..af0651c03b20 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -1098,7 +1098,19 @@ static int vpci_scan_bus(void *sysdata)
struct pci_bus *vpci_bus;
struct epf_ntb *ndev = sysdata;
- vpci_bus = pci_scan_bus(ndev->vbus_number, &vpci_ops, sysdata);
+ LIST_HEAD(resources);
+ static struct resource busn_res = {
+ .start = 0,
+ .end = 255,
+ .flags = IORESOURCE_BUS,
+ };
+
+ pci_add_resource(&resources, &ioport_resource);
+ pci_add_resource(&resources, &iomem_resource);
+ pci_add_resource(&resources, &busn_res);
+
+ vpci_bus = pci_scan_root_bus(&ndev->epf->epc->dev, ndev->vbus_number,
+ &vpci_ops, sysdata, &resources);
if (!vpci_bus) {
pr_err("create pci bus failed\n");
return -EINVAL;
--
2.48.1
next prev parent reply other threads:[~2025-11-30 15:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-30 15:10 [PATCH v3 0/7] PCI: endpoint/NTB: Harden vNTB resource management Koichiro Den
2025-11-30 15:10 ` [PATCH v3 1/7] NTB: epf: Avoid pci_iounmap() with offset when PEER_SPAD and CONFIG share BAR Koichiro Den
2025-11-30 15:10 ` [PATCH v3 2/7] PCI: endpoint: Fix parameter order for .drop_link Koichiro Den
2025-11-30 15:10 ` [PATCH v3 3/7] PCI: endpoint: pci-epf-vntb: Remove duplicate resource teardown Koichiro Den
2025-11-30 15:10 ` [PATCH v3 4/7] PCI: endpoint: pci-epf-ntb: " Koichiro Den
2025-11-30 15:10 ` [PATCH v3 5/7] NTB: epf: vntb: Stop cmd_handler work in epf_ntb_epc_cleanup Koichiro Den
2025-11-30 15:10 ` Koichiro Den [this message]
2025-12-01 18:51 ` [PATCH v3 6/7] PCI: endpoint: pci-epf-vntb: Switch vpci_scan_bus() to use pci_scan_root_bus() Frank Li
2025-12-02 7:11 ` Koichiro Den
2025-11-30 15:11 ` [PATCH v3 7/7] PCI: endpoint: pci-epf-vntb: Manage ntb_dev lifetime and fix vpci bus teardown Koichiro Den
2025-12-01 18:49 ` Frank Li
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=20251130151100.2591822-7-den@valinux.co.jp \
--to=den@valinux.co.jp \
--cc=Frank.Li@nxp.com \
--cc=allenbh@gmail.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=geert+renesas@glider.be \
--cc=jbrunet@baylibre.com \
--cc=jdmason@kudzu.us \
--cc=kishon@kernel.org \
--cc=kwilczynski@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=ntb@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=yebin10@huawei.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
all inboxes | Powered by JetHome®