public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-acpi@vger.kernel.org, Yinghai Lu <yhlu.kernel@gmail.com>,
	Joe Perches <joe@perches.com>, Len Brown <lenb@kernel.org>
Subject: [PATCH v2 4/9] PCI: set IORESOURCE_MEM_64 before printing resource
Date: Tue, 13 Oct 2009 13:22:15 -0600	[thread overview]
Message-ID: <20091013192215.22336.54808.stgit@bob.kio> (raw)
In-Reply-To: <20091013192040.22336.84876.stgit@bob.kio>

Set the IORESOURCE_MEM_64 struct resource flag before printing the
resource, so when %pR decodes the resource, we get the "64bit" text.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
 drivers/pci/probe.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8105e32..f760c19 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -225,7 +225,10 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
 		if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {
 			dev_err(&dev->dev, "can't handle 64-bit BAR\n");
 			goto fail;
-		} else if ((sizeof(resource_size_t) < 8) && l) {
+		}
+		
+		res->flags |= IORESOURCE_MEM_64;
+		if ((sizeof(resource_size_t) < 8) && l) {
 			/* Address above 32-bit boundary; disable the BAR */
 			pci_write_config_dword(dev, pos, 0);
 			pci_write_config_dword(dev, pos + 4, 0);
@@ -240,8 +243,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
 					"64bit mmio pref" : "64bit mmio",
 				 res);
 		}
-
-		res->flags |= IORESOURCE_MEM_64;
 	} else {
 		sz = pci_size(l, sz, mask);
 


  parent reply	other threads:[~2009-10-13 19:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-13 19:21 [PATCH v2 0/9] PCI, PNP: print resources consistently Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 1/9] vsprintf: fix io/mem resource width Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 2/9] vsprintf: add %pR support for IRQ and DMA resources Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 3/9] vsprintf: add %pR decoding and %pr for raw struct resource Bjorn Helgaas
2009-10-13 19:40   ` Joe Perches
2009-10-13 20:07     ` Bjorn Helgaas
2009-10-13 20:32       ` Joe Perches
2009-10-13 19:22 ` Bjorn Helgaas [this message]
2009-10-13 19:22 ` [PATCH v2 5/9] PCI: trivial bridge resource factorization Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 6/9] PCI: print resources consistently with %pR Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 7/9] x86/PCI: " Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 8/9] ia64/PCI: " Bjorn Helgaas
2009-10-13 19:22 ` [PATCH v2 9/9] PNP: " Bjorn Helgaas
2009-10-14  6:47 ` [PATCH v2 0/9] PCI, PNP: print resources consistently Yinghai Lu
2009-10-14 15:52   ` Bjorn Helgaas
2009-10-22 22:53 ` Bjorn Helgaas

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=20091013192215.22336.54808.stgit@bob.kio \
    --to=bjorn.helgaas@hp.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=joe@perches.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=yhlu.kernel@gmail.com \
    /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