From: Koichiro Den <den@valinux.co.jp>
To: Manivannan Sadhasivam <mani@kernel.org>,
Frank Li <Frank.Li@nxp.com>, Jon Mason <jdmason@kudzu.us>,
Dave Jiang <dave.jiang@intel.com>,
Allen Hubbe <allenbh@gmail.com>,
kwilczynski@kernel.org,
Kishon Vijay Abraham I <kishon@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Ye Bin <yebin10@huawei.com>,
Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: linux-pci@vger.kernel.org, ntb@lists.linux.dev,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 4/5] PCI: endpoint: pci-epf-vntb: Switch vpci_scan_bus() to use pci_scan_root_bus()
Date: Thu, 26 Feb 2026 17:41:41 +0900 [thread overview]
Message-ID: <20260226084142.2226875-5-den@valinux.co.jp> (raw)
In-Reply-To: <20260226084142.2226875-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.
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Koichiro Den <den@valinux.co.jp>
---
Changes since v4:
- Correct the subject prefix
s/NTB: epf: vntb:/PCI: endpoint: pci-epf-vntb:/
drivers/pci/endpoint/functions/pci-epf-vntb.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c
index 805353528967..f353e9a57194 100644
--- a/drivers/pci/endpoint/functions/pci-epf-vntb.c
+++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c
@@ -1220,8 +1220,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.51.0
next prev parent reply other threads:[~2026-02-26 8:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-26 8:41 [PATCH v5 0/5] PCI: endpoint: pci-epf-*ntb: Harden vNTB resource management Koichiro Den
2026-02-26 8:41 ` [PATCH v5 1/5] PCI: endpoint: pci-epf-vntb: Remove duplicate resource teardown Koichiro Den
2026-02-26 8:41 ` [PATCH v5 2/5] PCI: endpoint: pci-epf-ntb: " Koichiro Den
2026-02-26 8:41 ` [PATCH v5 3/5] PCI: endpoint: pci-epf-vntb: Stop cmd_handler work in epf_ntb_epc_cleanup Koichiro Den
2026-02-26 8:41 ` Koichiro Den [this message]
2026-03-02 16:09 ` [PATCH v5 4/5] PCI: endpoint: pci-epf-vntb: Switch vpci_scan_bus() to use pci_scan_root_bus() Manivannan Sadhasivam
2026-03-03 4:45 ` Koichiro Den
2026-02-26 8:41 ` [PATCH v5 5/5] PCI: endpoint: pci-epf-vntb: manage ntb_dev lifetime and fix vpci bus teardown Koichiro Den
2026-03-03 5:22 ` Manivannan Sadhasivam
2026-03-03 13:42 ` Koichiro Den
2026-03-04 3:10 ` [PATCH v5 0/5] PCI: endpoint: pci-epf-*ntb: Harden vNTB resource management Koichiro Den
2026-03-04 6:33 ` Manivannan Sadhasivam
2026-03-04 6:41 ` (subset) " Manivannan Sadhasivam
2026-03-04 8:43 ` Koichiro Den
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=20260226084142.2226875-5-den@valinux.co.jp \
--to=den@valinux.co.jp \
--cc=Frank.Li@nxp.com \
--cc=allenbh@gmail.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=geert+renesas@glider.be \
--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=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®