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>
Subject: [PATCH 03/21] PCI: Consolidate limit/base settting code
Date: Wed,  9 Jan 2019 20:57:21 -0800	[thread overview]
Message-ID: <20190110045739.19399-4-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190110045739.19399-1-andrew.smirnov@gmail.com>

Move limit/base settting code into a dedicated function order to avoid
repeating address masking code. No functional change intended.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/pci/pci.c | 64 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 6a327c6f88..11f84934f5 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -256,6 +256,42 @@ static void setup_device(struct pci_dev *dev, int max_bar)
 	list_add_tail(&dev->bus_list, &dev->bus->devices);
 }
 
+static void __pci_set_base_or_limit(struct pci_dev *dev, int r,
+				    resource_size_t addr, bool limit)
+{
+	int upper, where;
+
+	switch (r) {
+	case PCI_BUS_RESOURCE_IO:
+		where = limit ? PCI_IO_LIMIT : PCI_IO_BASE;
+		upper = limit ? PCI_IO_LIMIT_UPPER16 : PCI_IO_BASE_UPPER16;
+
+		pci_write_config_byte(dev, where, (addr & 0x0000f000) >> 8);
+		pci_write_config_word(dev, upper, (addr & 0xffff0000) >> 16);
+		return;
+	case PCI_BUS_RESOURCE_MEM:
+		where = limit ? PCI_MEMORY_LIMIT : PCI_MEMORY_BASE;
+		break;
+	case PCI_BUS_RESOURCE_MEM_PREF:
+		where = limit ? PCI_PREF_MEMORY_LIMIT : PCI_PREF_MEMORY_BASE;
+		break;
+	default:
+		BUG();
+	}
+
+	pci_write_config_word(dev, where, (addr & 0xfff00000) >> 16);
+}
+
+static void pci_set_limit(struct pci_dev *dev, int r, resource_size_t addr)
+{
+	__pci_set_base_or_limit(dev, r, addr, true);
+}
+
+static void pci_set_base(struct pci_dev *dev, int r, resource_size_t addr)
+{
+	__pci_set_base_or_limit(dev, r, addr, false);
+}
+
 static void prescan_setup_bridge(struct pci_dev *dev)
 {
 	u16 cmdstat;
@@ -270,8 +306,8 @@ static void prescan_setup_bridge(struct pci_dev *dev)
 	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_write_config_word(dev, PCI_MEMORY_BASE,
-				      (last[PCI_BUS_RESOURCE_MEM] & 0xfff00000) >> 16);
+		pci_set_base(dev, PCI_BUS_RESOURCE_MEM,
+			     last[PCI_BUS_RESOURCE_MEM]);
 		cmdstat |= PCI_COMMAND_MEMORY;
 	}
 
@@ -280,8 +316,8 @@ static void prescan_setup_bridge(struct pci_dev *dev)
 		last[PCI_BUS_RESOURCE_MEM_PREF] =
 			ALIGN(last[PCI_BUS_RESOURCE_MEM_PREF],
 			      SZ_1M);
-		pci_write_config_word(dev, PCI_PREF_MEMORY_BASE,
-				      (last[PCI_BUS_RESOURCE_MEM_PREF] & 0xfff00000) >> 16);
+		pci_set_base(dev, PCI_BUS_RESOURCE_MEM_PREF,
+			     last[PCI_BUS_RESOURCE_MEM_PREF]);
 		cmdstat |= PCI_COMMAND_MEMORY;
 	} else {
 
@@ -292,10 +328,8 @@ static void prescan_setup_bridge(struct pci_dev *dev)
 
 	if (last[PCI_BUS_RESOURCE_IO]) {
 		last[PCI_BUS_RESOURCE_IO] = ALIGN(last[PCI_BUS_RESOURCE_IO], SZ_4K);
-		pci_write_config_byte(dev, PCI_IO_BASE,
-				      (last[PCI_BUS_RESOURCE_IO] & 0x0000f000) >> 8);
-		pci_write_config_word(dev, PCI_IO_BASE_UPPER16,
-				      (last[PCI_BUS_RESOURCE_IO] & 0xffff0000) >> 16);
+		pci_set_base(dev, PCI_BUS_RESOURCE_IO,
+			     last[PCI_BUS_RESOURCE_IO]);
 		cmdstat |= PCI_COMMAND_IO;
 	}
 
@@ -311,24 +345,22 @@ static void postscan_setup_bridge(struct pci_dev *dev)
 	if (last[PCI_BUS_RESOURCE_MEM]) {
 		last[PCI_BUS_RESOURCE_MEM] = ALIGN(last[PCI_BUS_RESOURCE_MEM], SZ_1M);
 		pr_debug("bridge NP limit at %pa\n", &last[PCI_BUS_RESOURCE_MEM]);
-		pci_write_config_word(dev, PCI_MEMORY_LIMIT,
-				      ((last[PCI_BUS_RESOURCE_MEM] - 1) & 0xfff00000) >> 16);
+		pci_set_limit(dev, PCI_BUS_RESOURCE_MEM,
+			      last[PCI_BUS_RESOURCE_MEM] - 1);
 	}
 
 	if (last[PCI_BUS_RESOURCE_MEM_PREF]) {
 		last[PCI_BUS_RESOURCE_MEM_PREF] = ALIGN(last[PCI_BUS_RESOURCE_MEM_PREF], SZ_1M);
 		pr_debug("bridge P limit at %pa\n", &last[PCI_BUS_RESOURCE_MEM_PREF]);
-		pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT,
-				      ((last[PCI_BUS_RESOURCE_MEM_PREF] - 1) & 0xfff00000) >> 16);
+		pci_set_limit(dev, PCI_BUS_RESOURCE_MEM_PREF,
+			      last[PCI_BUS_RESOURCE_MEM_PREF] - 1);
 	}
 
 	if (last[PCI_BUS_RESOURCE_IO]) {
 		last[PCI_BUS_RESOURCE_IO] = ALIGN(last[PCI_BUS_RESOURCE_IO], SZ_4K);
 		pr_debug("bridge IO limit at %pa\n", &last[PCI_BUS_RESOURCE_IO]);
-		pci_write_config_byte(dev, PCI_IO_LIMIT,
-				((last[PCI_BUS_RESOURCE_IO] - 1) & 0x0000f000) >> 8);
-		pci_write_config_word(dev, PCI_IO_LIMIT_UPPER16,
-				((last[PCI_BUS_RESOURCE_IO] - 1) & 0xffff0000) >> 16);
+		pci_set_limit(dev, PCI_BUS_RESOURCE_IO,
+			      last[PCI_BUS_RESOURCE_IO] - 1);
 	}
 }
 
-- 
2.20.1


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

  parent reply	other threads:[~2019-01-10  4:58 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-10  4:57 [PATCH 00/21] PCI improvements Andrey Smirnov
2019-01-10  4:57 ` [PATCH 01/21] PCI: Switch to using %pa to print memory addresses Andrey Smirnov
2019-01-10  4:57 ` [PATCH 02/21] PCI: Replace last_* variables with an array Andrey Smirnov
2019-01-10  4:57 ` Andrey Smirnov [this message]
2019-01-10  4:57 ` [PATCH 04/21] PCI: Convert prescan_setup_bridge() to use a loop Andrey Smirnov
2019-01-10  4:57 ` [PATCH 05/21] PCI: Convert postscan_setup_bridge() " Andrey Smirnov
2019-01-10 10:09   ` Sascha Hauer
2019-01-10 19:16     ` Andrey Smirnov
2019-01-11 10:47       ` Sascha Hauer
2019-01-12  2:34         ` Andrey Smirnov
2019-01-10  4:57 ` [PATCH 06/21] PCI: Replace magic number in setup_device() Andrey Smirnov
2019-01-10  4:57 ` [PATCH 07/21] PCI: Remove superfluous parens " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 08/21] PCI: Simplify resource setup code " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 09/21] PCI: Store and reuse BAR offsets Andrey Smirnov
2019-01-10  4:57 ` [PATCH 10/21] PCI: Conver register_pci_controller() to use a loop Andrey Smirnov
2019-01-10  4:57 ` [PATCH 11/21] PCI: Remove unused variables/code Andrey Smirnov
2019-01-10  4:57 ` [PATCH 12/21] PCI: Make pci_scan_bus static Andrey Smirnov
2019-01-10  4:57 ` [PATCH 13/21] PCI: Drop "slots" from struct pci_bus Andrey Smirnov
2019-01-10  4:57 ` [PATCH 14/21] PCI: Drop "resources" " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 15/21] PCI: Drop "name" " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 16/21] PCI: Drop "ops" " Andrey Smirnov
2019-01-10  4:57 ` [PATCH 17/21] PCI: Drop "rom_address" from struct pci_dev Andrey Smirnov
2019-01-10  4:57 ` [PATCH 18/21] PCI: Simplify alloc_pci_dev() Andrey Smirnov
2019-01-10  4:57 ` [PATCH 19/21] PCI: Assume 1:1 mapping if .res_start callback is NULL Andrey Smirnov
2019-01-10  4:57 ` [PATCH 20/21] PCI: Convert ->res_start() to return resource_size_t Andrey Smirnov
2019-01-10  4:57 ` [PATCH 21/21] PCI: Consify pci_ops in struct pci_controller Andrey Smirnov

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=20190110045739.19399-4-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.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