From: Yu Zhao <yu.zhao@intel.com>
To: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Cc: "jbarnes@virtuousgeek.org" <jbarnes@virtuousgeek.org>,
"randy.dunlap@oracle.com" <randy.dunlap@oracle.com>,
"grundler@parisc-linux.org" <grundler@parisc-linux.org>,
"achiang@hp.com" <achiang@hp.com>,
"matthew@wil.cx" <matthew@wil.cx>,
"rdreier@cisco.com" <rdreier@cisco.com>,
"greg@kroah.com" <greg@kroah.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>
Subject: [PATCH 3/15 v5] PCI: export __pci_read_base
Date: Tue, 21 Oct 2008 19:45:27 +0800 [thread overview]
Message-ID: <20081021114527.GD3185@yzhao12-linux.sh.intel.com> (raw)
In-Reply-To: <20081021114056.GA3185@yzhao12-linux.sh.intel.com>
Export __pci_read_base() so it can be used by whole PCI subsystem.
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: Alex Chiang <achiang@hp.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Roland Dreier <rdreier@cisco.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Yu Zhao <yu.zhao@intel.com>
---
drivers/pci/pci.h | 9 +++++++++
drivers/pci/probe.c | 20 +++++++++-----------
2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index b205ab8..fbbc6ad 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -157,6 +157,15 @@ struct pci_slot_attribute {
};
#define to_pci_slot_attr(s) container_of(s, struct pci_slot_attribute, attr)
+enum pci_bar_type {
+ pci_bar_unknown, /* Standard PCI BAR probe */
+ pci_bar_io, /* An io port BAR */
+ pci_bar_mem32, /* A 32-bit memory BAR */
+ pci_bar_mem64, /* A 64-bit memory BAR */
+};
+
+extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+ struct resource *res, unsigned int reg);
extern void pci_enable_ari(struct pci_dev *dev);
/**
* pci_ari_enabled - query ARI forwarding status
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index a52784c..db3e5a7 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -135,13 +135,6 @@ static u64 pci_size(u64 base, u64 maxbase, u64 mask)
return size;
}
-enum pci_bar_type {
- pci_bar_unknown, /* Standard PCI BAR probe */
- pci_bar_io, /* An io port BAR */
- pci_bar_mem32, /* A 32-bit memory BAR */
- pci_bar_mem64, /* A 64-bit memory BAR */
-};
-
static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar)
{
if ((bar & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO) {
@@ -156,11 +149,16 @@ static inline enum pci_bar_type decode_bar(struct resource *res, u32 bar)
return pci_bar_mem32;
}
-/*
- * If the type is not unknown, we assume that the lowest bit is 'enable'.
- * Returns 1 if the BAR was 64-bit and 0 if it was 32-bit.
+/**
+ * pci_read_base - read a PCI BAR
+ * @dev: the PCI device
+ * @type: type of the BAR
+ * @res: resource buffer to be filled in
+ * @pos: BAR position in the config space
+ *
+ * Returns 1 if the BAR is 64-bit, or 0 if 32-bit.
*/
-static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
struct resource *res, unsigned int pos)
{
u32 l, sz, mask;
--
1.5.6.4
next prev parent reply other threads:[~2008-10-21 12:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-21 11:40 [PATCH 0/15 v5] PCI: Linux kernel SR-IOV support Yu Zhao
2008-10-21 11:44 ` [PATCH 1/15 v5] PCI: remove unnecessary arg of pci_update_resource() Yu Zhao
2008-10-21 11:44 ` [PATCH 2/15 v5] PCI: define PCI resource names in an 'enum' Yu Zhao
2008-10-21 11:45 ` Yu Zhao [this message]
2008-10-21 11:47 ` [PATCH 4/15 v5] PCI: make pci_alloc_child_bus() be able to handle NULL bridge Yu Zhao
2008-10-21 11:48 ` [PATCH 5/15 v5] PCI: add a wrapper for resource_alignment() Yu Zhao
2008-10-21 11:48 ` [PATCH 6/15 v5] PCI: add a new function to map BAR offset Yu Zhao
2008-10-21 11:48 ` [PATCH 7/15 v5] PCI: cleanup pcibios_allocate_resources() Yu Zhao
2008-10-21 11:49 ` [PATCH 8/15 v5] PCI: add boot options to reassign resources Yu Zhao
2008-10-22 7:19 ` Ingo Molnar
2008-10-21 11:50 ` [PATCH 9/15 v5] PCI: add boot option to align MMIO resource Yu Zhao
2008-10-21 11:51 ` [PATCH 10/15 v5] PCI: cleanup pci_bus_add_devices() Yu Zhao
2008-10-21 11:52 ` [PATCH 11/15 v5] PCI: split a new function from pci_bus_add_devices() Yu Zhao
2008-10-21 11:53 ` [PATCH 12/15 v5] PCI: support the SR-IOV capability Yu Zhao
2008-10-21 16:50 ` Greg KH
2008-10-22 3:05 ` Zhao, Yu
2008-10-21 11:53 ` [PATCH 13/15 v5] PCI: reserve bus range for the SR-IOV device Yu Zhao
2008-10-21 11:54 ` [PATCH 14/15 v5] PCI: document the SR-IOV Yu Zhao
2008-10-21 11:54 ` [PATCH 15/15 v5] PCI: document the new PCI boot parameters Yu Zhao
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=20081021114527.GD3185@yzhao12-linux.sh.intel.com \
--to=yu.zhao@intel.com \
--cc=achiang@hp.com \
--cc=greg@kroah.com \
--cc=grundler@parisc-linux.org \
--cc=jbarnes@virtuousgeek.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=randy.dunlap@oracle.com \
--cc=rdreier@cisco.com \
--cc=virtualization@lists.linux-foundation.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