Commit ff61f380 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: Fix old_size lower bound in calculate_iosize() too 

Commit 903534fa ("PCI: Fix resource double counting on remove &
rescan") fixed double counting of mem resources because of old_size being
applied too early.

Fix a similar counting bug on the io resource side.

Link: https://lore.kernel.org/r/20241216175632.4175-6-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Tested-by: default avatarXiaochun Lee <lixc17@lenovo.com>
parent 67f90855

drivers/pci/setup-bus.c

+2 −4
Original line number Diff line number Diff line
@@ -814,11 +814,9 @@ static resource_size_t calculate_iosize(resource_size_t size, 
	size = (size & 0xff) + ((size & ~0xffUL) << 2);

#endif

	size = size + size1;

	if (size < old_size)

		size = old_size;



	size = ALIGN(max(size, add_size) + children_add_size, align);

	return size;

	size = max(size, add_size) + children_add_size;

	return ALIGN(max(size, old_size), align);

}



static resource_size_t calculate_memsize(resource_size_t size,