Linux PCI subsystem development
 help / color / mirror / Atom feed
From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-pci@vger.kernel.org, "Bjorn Helgaas" <bhelgaas@google.com>,
	"Lorenzo Pieralisi" <lorenzo.pieralisi@arm.com>,
	"Rob Herring" <robh@kernel.org>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Rafael J. Wysocki (Intel)" <rafael@kernel.org>,
	linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>, stable@vger.kernel.org
Subject: [PATCH v2 04/16] PCI: Add pci_assign_unassigned_slot_resources()
Date: Fri, 20 Nov 2026 15:46:59 +0200	[thread overview]
Message-ID: <20261120134716.3027-5-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20261120134716.3027-1-ilpo.jarvinen@linux.intel.com>

Bridge window sizing and resource assignment need locks that are held
across both phases. acpiphp open-codes
pci_assign_unassigned_bus_resources() with a slot filter by calling the
internal sizing and assignment functions directly, so it would have to
duplicate that locking.

Add pci_assign_unassigned_slot_resources() which sizes only the bridges
in the given slot, and implement pci_assign_unassigned_bus_resources()
with it.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: stable@vger.kernel.org
---
 drivers/pci/pci.h       |  1 +
 drivers/pci/setup-bus.c | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 77efa4c5c960..ce29d9ca0194 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -542,6 +542,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
 void __pci_bus_assign_resources(const struct pci_bus *bus,
 				struct list_head *add_list,
 				struct list_head *fail_head);
+void pci_assign_unassigned_slot_resources(struct pci_bus *bus, u16 slot);
 bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
 void pci_walk_bus_locked(struct pci_bus *top,
 			 int (*cb)(struct pci_dev *, void *),
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 10b9d3eb2864..7d135ddd93b2 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -2489,19 +2489,38 @@ int pci_do_resource_release_and_resize(struct pci_dev *pdev, int resno, int size
 						    exclude_bars);
 }
 
-void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
+/**
+ * pci_assign_unassigned_slot_resources - Size and assign resources of a slot
+ * @bus: PCI bus
+ * @slot: Slot whose bridges to size, or %PCI_SLOT_ALL_DEVICES for all
+ *	  bridges on @bus
+ *
+ * Size the bridge windows of the bridges in @slot and assign unassigned
+ * resources on @bus.
+ */
+void pci_assign_unassigned_slot_resources(struct pci_bus *bus, u16 slot)
 {
 	struct pci_dev *dev;
 	/* List of resources that want additional resources */
 	LIST_HEAD(add_list);
 
 	down_read(&pci_bus_sem);
-	for_each_pci_bridge(dev, bus)
+	for_each_pci_bridge(dev, bus) {
+		if (slot != PCI_SLOT_ALL_DEVICES &&
+		    PCI_SLOT(dev->devfn) != slot)
+			continue;
+
 		if (pci_has_subordinate(dev))
 			__pci_bus_size_bridges(dev->subordinate, &add_list);
+	}
 	up_read(&pci_bus_sem);
 	__pci_bus_assign_resources(bus, &add_list, NULL);
 }
+
+void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
+{
+	pci_assign_unassigned_slot_resources(bus, PCI_SLOT_ALL_DEVICES);
+}
 EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
 
 void pci_bus_size_and_assign_resources(struct pci_bus *bus)
-- 
2.47.3


  parent reply	other threads:[~2026-11-20 13:48 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20 13:46 [PATCH v2 00/16] PCI: Serialize bridge window sizing and resource assignment Ilpo Järvinen
2026-11-20 13:46 ` [PATCH v2 01/16] PCI: Add pci_bus_size_and_assign_resources() Ilpo Järvinen
2026-11-20 13:53   ` sashiko-bot
2026-11-20 13:46 ` [PATCH v2 02/16] alpha/PCI: Convert to pci_bus_size_and_assign_resources() Ilpo Järvinen
2026-11-20 13:55   ` sashiko-bot
2026-11-20 13:46 ` [PATCH v2 03/16] PCI: Use guard() for pci_bus_sem in pci_do_resource_release_and_resize() Ilpo Järvinen
2026-11-20 13:54   ` sashiko-bot
2026-11-20 13:46 ` Ilpo Järvinen [this message]
2026-11-20 13:53   ` [PATCH v2 04/16] PCI: Add pci_assign_unassigned_slot_resources() sashiko-bot
2026-11-20 13:47 ` [PATCH v2 05/16] PCI: acpiphp: Use pci_assign_unassigned_slot_resources() Ilpo Järvinen
2026-11-20 13:54   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 06/16] PCI: Hold pci_bus_sem across sizing and assignment entrypoints Ilpo Järvinen
2026-11-20 13:55   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 07/16] PCI: Serialize bridge window sizing and resource assignment Ilpo Järvinen
2026-11-20 14:00   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 08/16] PCI: Make internal sizing and assignment functions static Ilpo Järvinen
2026-11-20 13:52   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 09/16] EDAC/i82875p: Convert to pci_assign_unassigned_bus_resources() Ilpo Järvinen
2026-11-20 13:56   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 10/16] platform/x86: asus-wmi: " Ilpo Järvinen
2026-11-20 13:53   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 11/16] platform/x86: eeepc-laptop: " Ilpo Järvinen
2026-11-20 13:55   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 12/16] parisc/PCI: " Ilpo Järvinen
2026-11-20 13:59   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 13/16] PCI: octep_hp: " Ilpo Järvinen
2026-11-20 13:58   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 14/16] PCI: ftpci100: " Ilpo Järvinen
2026-11-20 13:57   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 15/16] PCI: hv: " Ilpo Järvinen
2026-11-20 13:56   ` sashiko-bot
2026-11-20 13:47 ` [PATCH v2 16/16] PCI: Remove pci_bus_assign_resources() Ilpo Järvinen
2026-11-20 13:55   ` sashiko-bot

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=20261120134716.3027-5-ilpo.jarvinen@linux.intel.com \
    --to=ilpo.jarvinen@linux.intel.com \
    --cc=bhelgaas@google.com \
    --cc=kw@linux.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=rafael@kernel.org \
    --cc=robh@kernel.org \
    --cc=stable@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