mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH v3 05/16] PCI: Store and reuse BAR offsets
Date: Sun, 13 Jan 2019 22:16:58 -0800	[thread overview]
Message-ID: <20190114061709.13948-6-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190114061709.13948-1-andrew.smirnov@gmail.com>

Save and reuse BAR offsets in dedicated constants instead of repeating
the same expression multiple times. No functional change intended.

Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/pci/pci.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 6d866dc30a..265c416085 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -169,16 +169,18 @@ static void setup_device(struct pci_dev *dev, int max_bar)
 			      cmd & ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY));
 
 	for (bar = 0; bar < max_bar; bar++) {
+		const int pci_base_address_0 = PCI_BASE_ADDRESS_0 + bar * 4;
+		const int pci_base_address_1 = PCI_BASE_ADDRESS_1 + bar * 4;
 		resource_size_t *last_addr;
 		u32 orig, mask, size;
 		unsigned long flags;
 		const char *kind;
 		int busres;
 
-		pci_read_config_dword(dev, PCI_BASE_ADDRESS_0 + bar * 4, &orig);
-		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + bar * 4, 0xfffffffe);
-		pci_read_config_dword(dev, PCI_BASE_ADDRESS_0 + bar * 4, &mask);
-		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + bar * 4, orig);
+		pci_read_config_dword(dev, pci_base_address_0, &orig);
+		pci_write_config_dword(dev, pci_base_address_0, 0xfffffffe);
+		pci_read_config_dword(dev, pci_base_address_0, &mask);
+		pci_write_config_dword(dev, pci_base_address_0, orig);
 
 		if (mask == 0 || mask == 0xffffffff) {
 			pr_debug("pbar%d set bad mask\n", bar);
@@ -221,8 +223,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
 		}
 
 		*last_addr = ALIGN(*last_addr, size);
-		pci_write_config_dword(dev, PCI_BASE_ADDRESS_0 + bar * 4,
-				       *last_addr);
+		pci_write_config_dword(dev, pci_base_address_0, *last_addr);
 		dev->resource[bar].flags = flags;
 		dev->resource[bar].start = *last_addr;
 		dev->resource[bar].end = dev->resource[bar].start + size - 1;
@@ -233,8 +234,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
 
 		if (mask & PCI_BASE_ADDRESS_MEM_TYPE_64) {
 			dev->resource[bar].flags |= IORESOURCE_MEM_64;
-			pci_write_config_dword(dev,
-			       PCI_BASE_ADDRESS_1 + bar * 4, 0);
+			pci_write_config_dword(dev, pci_base_address_1, 0);
 			bar++;
 		}
 	}
-- 
2.20.1


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

  parent reply	other threads:[~2019-01-14  6:17 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-14  6:16 [PATCH v3 00/16] PCI improvements Andrey Smirnov
2019-01-14  6:16 ` [PATCH v3 01/16] PCI: Switch to using %pa to print memory addresses Andrey Smirnov
2019-01-14  6:16 ` [PATCH v3 02/16] PCI: Replace magic number in setup_device() Andrey Smirnov
2019-01-14  6:16 ` [PATCH v3 03/16] PCI: Remove superfluous parens " Andrey Smirnov
2019-01-14  6:16 ` [PATCH v3 04/16] PCI: Simplify resource setup code " Andrey Smirnov
2019-01-14  6:16 ` Andrey Smirnov [this message]
2019-01-14  6:16 ` [PATCH v3 06/16] PCI: Remove unused variables/code Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 07/16] PCI: Make pci_scan_bus static Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 08/16] PCI: Drop "slots" from struct pci_bus Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 09/16] PCI: Drop "resources" " Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 10/16] PCI: Drop "name" " Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 11/16] PCI: Drop "ops" " Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 12/16] PCI: Drop "rom_address" from struct pci_dev Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 13/16] PCI: Simplify alloc_pci_dev() Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 14/16] PCI: Assume 1:1 mapping if .res_start callback is NULL Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 15/16] PCI: Convert ->res_start() to return resource_size_t Andrey Smirnov
2019-01-14  6:17 ` [PATCH v3 16/16] PCI: Consify pci_ops in struct pci_controller Andrey Smirnov
2019-01-16  7:36 ` [PATCH v3 00/16] PCI improvements Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190114061709.13948-6-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=sam@ravnborg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox