[PATCH 04/21] PCI: Convert prescan_setup_bridge() to use a loop

[Andrey Smirnov <andrew.smirnov@xxxxxxxxx>]

Simplify prescan_setup_bridge() by folding base setup code into a
loop. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
---
 drivers/pci/pci.c | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 11f84934f5..02b7f091f7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -256,6 +256,11 @@ static void setup_device(struct pci_dev *dev, int max_bar)
 	list_add_tail(&dev->bus_list, &dev->bus->devices);
 }
 
+static size_t pci_resource_to_alignment(int r)
+{
+	return (r == PCI_BUS_RESOURCE_IO) ? SZ_4K : SZ_1M;
+}
+
 static void __pci_set_base_or_limit(struct pci_dev *dev, int r,
 				    resource_size_t addr, bool limit)
 {
@@ -295,6 +300,7 @@ static void pci_set_base(struct pci_dev *dev, int r, resource_size_t addr)
 static void prescan_setup_bridge(struct pci_dev *dev)
 {
 	u16 cmdstat;
+	int r;
 
 	pci_read_config_word(dev, PCI_COMMAND, &cmdstat);
 
@@ -303,36 +309,21 @@ static void prescan_setup_bridge(struct pci_dev *dev)
 	pci_write_config_byte(dev, PCI_SECONDARY_BUS, dev->subordinate->number);
 	pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, 0xff);
 
-	if (last[PCI_BUS_RESOURCE_MEM]) {
-		/* Set up memory and I/O filter limits, assume 32-bit I/O space */
-		last[PCI_BUS_RESOURCE_MEM] = ALIGN(last[PCI_BUS_RESOURCE_MEM], SZ_1M);
-		pci_set_base(dev, PCI_BUS_RESOURCE_MEM,
-			     last[PCI_BUS_RESOURCE_MEM]);
-		cmdstat |= PCI_COMMAND_MEMORY;
+	for (r = PCI_BUS_RESOURCE_IO; r <= PCI_BUS_RESOURCE_MEM_PREF; r++) {
+		if (last[r]) {
+			cmdstat |= (r == PCI_BUS_RESOURCE_IO) ?
+				PCI_COMMAND_IO : PCI_COMMAND_MEMORY;
+			last[r] = ALIGN(last[r], pci_resource_to_alignment(r));
+			pci_set_base(dev, r, last[r]);
+		}
 	}
 
-	if (last[PCI_BUS_RESOURCE_MEM_PREF]) {
-		/* Set up memory and I/O filter limits, assume 32-bit I/O space */
-		last[PCI_BUS_RESOURCE_MEM_PREF] =
-			ALIGN(last[PCI_BUS_RESOURCE_MEM_PREF],
-			      SZ_1M);
-		pci_set_base(dev, PCI_BUS_RESOURCE_MEM_PREF,
-			     last[PCI_BUS_RESOURCE_MEM_PREF]);
-		cmdstat |= PCI_COMMAND_MEMORY;
-	} else {
-
+	if (!last[PCI_BUS_RESOURCE_MEM_PREF]) {
 		/* We don't support prefetchable memory for now, so disable */
 		pci_write_config_word(dev, PCI_PREF_MEMORY_BASE, 0x1000);
 		pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT, 0x0);
 	}
 
-	if (last[PCI_BUS_RESOURCE_IO]) {
-		last[PCI_BUS_RESOURCE_IO] = ALIGN(last[PCI_BUS_RESOURCE_IO], SZ_4K);
-		pci_set_base(dev, PCI_BUS_RESOURCE_IO,
-			     last[PCI_BUS_RESOURCE_IO]);
-		cmdstat |= PCI_COMMAND_IO;
-	}
-
 	/* Enable memory and I/O accesses, enable bus master */
 	pci_write_config_word(dev, PCI_COMMAND, cmdstat | PCI_COMMAND_MASTER);
 }
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox