[v2,3/4] PCI: Change extend_bridge_window() to set resource size directly

Commit Message

Nicholas Johnson Jan. 15, 2020, 5:57 p.m. UTC

Change extend_bridge_window() to set resource size directly instead of
using additional resource lists.

This is required in preparation for the next patch [0] which will allow
the resource to shrink. If we do not make this change, the next patch
will need to have complicated logic to handle shrinking the overall size
using size and add_size.

Remove the resource from add_list, as a zero-sized additional resource
is redundant.

Update comment in pci_bus_distribute_available_resources() to reflect
the above changes.

[0]
PCI: Allow extend_bridge_window() to shrink resource if necessary

Signed-off-by: Nicholas Johnson <[e-mail]>
---
 drivers/pci/setup-bus.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

Comments

Mika Westerberg Jan. 16, 2020, 10:21 a.m. UTC | #1

On Wed, Jan 15, 2020 at 05:57:47PM +0000, Nicholas Johnson wrote:
> Change extend_bridge_window() to set resource size directly instead of
> using additional resource lists.
> 
> This is required in preparation for the next patch [0] which will allow
> the resource to shrink. If we do not make this change, the next patch
> will need to have complicated logic to handle shrinking the overall size
> using size and add_size.
> 
> Remove the resource from add_list, as a zero-sized additional resource
> is redundant.
> 
> Update comment in pci_bus_distribute_available_resources() to reflect
> the above changes.
> 
> [0]
> PCI: Allow extend_bridge_window() to shrink resource if necessary
> 
> Signed-off-by: Nicholas Johnson <[e-mail]>

Reviewed-by: Mika Westerberg <[e-mail]>

Patch

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index de43815be..50d14921a 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1836,7 +1836,7 @@  static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res,
 				 struct list_head *add_list,
 				 resource_size_t new_size)
 {
-	struct pci_dev_resource *dev_res;
+	resource_size_t add_size;
 
 	if (res->parent)
 		return;
@@ -1844,17 +1844,10 @@  static void adjust_bridge_window(struct pci_dev *bridge, struct resource *res,
 	if (resource_size(res) >= new_size)
 		return;
 
-	dev_res = res_to_dev_res(add_list, res);
-	if (!dev_res)
-		return;
-
-	/* Is there room to extend the window? */
-	if (new_size - resource_size(res) <= dev_res->add_size)
-		return;
-
-	dev_res->add_size = new_size - resource_size(res);
-	pci_dbg(bridge, "bridge window %pR extended by %pa\n", res,
-		&dev_res->add_size);
+	add_size = new_size - resource_size(res);
+	pci_dbg(bridge, "bridge window %pR extended by %pa\n", res, &add_size);
+	res->end = res->start + new_size - 1;
+	remove_from_list(add_list, res);
 }
 
 static void pci_bus_distribute_available_resources(struct pci_bus *bus,
@@ -1890,10 +1883,8 @@  static void pci_bus_distribute_available_resources(struct pci_bus *bus,
 			mmio_pref.end + 1);
 
 	/*
-	 * Update additional resource list (add_list) to fill all the
-	 * extra resource space available for this port except the space
-	 * calculated in __pci_bus_size_bridges() which covers all the
-	 * devices currently connected to the port and below.
+	 * Now that we have adjusted for alignment, update the bridge window
+	 * resources to fill as much remaining resource space as possible.
 	 */
 	adjust_bridge_window(bridge, io_res, add_list, resource_size(&io));
 	adjust_bridge_window(bridge, mmio_res, add_list, resource_size(&mmio));