Skip to content

Commit a3b93b4

Browse files
ij-intelbjorn-helgaas
authored andcommitted
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: 6a5e64c ("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
1 parent e5f72cb commit a3b93b4

1 file changed

Lines changed: 16 additions & 13 deletions

File tree

drivers/pci/setup-bus.c

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,31 +1224,34 @@ static bool pbus_size_mem_optional(struct pci_dev *dev, int resno,
12241224
struct resource *res = pci_resource_n(dev, resno);
12251225
bool optional = pci_resource_is_optional(dev, resno);
12261226
resource_size_t r_size = resource_size(res);
1227-
struct pci_dev_resource *dev_res;
1227+
struct pci_dev_resource *dev_res = NULL;
12281228

12291229
if (!realloc_head)
12301230
return false;
12311231

1232-
if (!optional) {
1233-
/*
1234-
* Only bridges have optional sizes in realloc_head at this
1235-
* point. As res_to_dev_res() walks the entire realloc_head
1236-
* list, skip calling it when known unnecessary.
1237-
*/
1238-
if (!pci_resource_is_bridge_win(resno))
1239-
return false;
1240-
1232+
/*
1233+
* Only bridges have optional sizes in realloc_head at this
1234+
* point. As res_to_dev_res() walks the entire realloc_head
1235+
* list, skip calling it when known unnecessary.
1236+
*/
1237+
if (pci_resource_is_bridge_win(resno)) {
12411238
dev_res = res_to_dev_res(realloc_head, res);
12421239
if (dev_res) {
12431240
*children_add_size += dev_res->add_size;
12441241
*add_align = max(*add_align, dev_res->min_align);
12451242
}
1243+
}
12461244

1245+
if (!optional)
12471246
return false;
1248-
}
12491247

1250-
/* Put SRIOV requested res to the optional list */
1251-
pci_dev_res_add_to_list(realloc_head, dev, res, 0, align);
1248+
/*
1249+
* Put requested res to the optional list if not there yet (SR-IOV,
1250+
* disabled ROM). Bridge windows with an optional part are already
1251+
* on the list.
1252+
*/
1253+
if (!dev_res)
1254+
pci_dev_res_add_to_list(realloc_head, dev, res, 0, align);
12521255
*children_add_size += r_size;
12531256
*add_align = max(align, *add_align);
12541257

0 commit comments

Comments
 (0)