]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
PCI: Account fully optional bridge windows correctly
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Wed, 18 Feb 2026 22:34:18 +0000 (00:34 +0200)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 19 Feb 2026 21:33:40 +0000 (15:33 -0600)
commita3b93b42238b3bb9eefc25729f567e66eea66a56
treef1d962ce7e94dfd21f08f6241a186b947c962f39
parente5f72cb9cea599dc9f5a9b80a33560a1d06f01cc
PCI: Account fully optional bridge windows correctly

pbus_size_mem_optional() adds dev_res->add_size of a bridge window into
children_add_size when the window has a non-optional part. However, if the
bridge window is fully optional, only r_size is added (which is zero for
such a window).

Also, a second dev_res entry will be added by pci_dev_res_add_to_list()
into realloc_head for the bridge window (resulting in triggering the
realloc_head-must-be-fully-consumed sanity check after a single pass of the
resource assignment algorithm):

  WARNING: drivers/pci/setup-bus.c:2153 at pci_assign_unassigned_root_bus_resources+0xa5/0x260

Correct these problems by always adding dev_res->add_size for bridge
windows and not calling pci_dev_res_add_to_list() if the dev_res entry
exists.

Fixes: 6a5e64c75e82 ("PCI: Add pbus_mem_size_optional() to handle optional sizes")
Reported-by: RavitejaX Veesam <ravitejax.veesam@intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Tested-by: RavitejaX Veesam <ravitejax.veesam@intel.com>
Link: https://patch.msgid.link/20260218223419.22366-1-ilpo.jarvinen@linux.intel.com
drivers/pci/setup-bus.c