Rework pci_find_next_ext_capability(), use
pci_bus_read_config_xxx() instead of
pci_read_config_xxx(). So we can use this
function before pci_dev setup.
Signed-off-by: Yijing Wang <wangyij...@huawei.com>
---
drivers/pci/pci.c | 17 +++++++++--------
include/linux/pci.h | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1febe90..a263c0a 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -256,7 +256,8 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned
int devfn, int cap)
/**
* pci_find_next_ext_capability - Find an extended capability
- * @dev: PCI device to query
+ * @bus: the PCI bus to query
+ * @devfn: PCI device to query
* @start: address at which to start looking (0 to start at beginning of list)
* @cap: capability code
*
@@ -265,7 +266,7 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned
int devfn, int cap)
* not support it. Some capabilities can occur several times, e.g., the
* vendor-specific capability, and this provides a way to find them all.
*/
-int pci_find_next_ext_capability(struct pci_dev *dev, int start, int cap)
+int pci_find_next_ext_capability(struct pci_bus *bus, int devfn, int start,
int cap)
{
u32 header;
int ttl;
@@ -274,13 +275,10 @@ int pci_find_next_ext_capability(struct pci_dev *dev, int
start, int cap)
/* minimum 8 bytes per capability */
ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8;
- if (dev->cfg_size <= PCI_CFG_SPACE_SIZE)
- return 0;
-
if (start)
pos = start;
- if (pci_read_config_dword(dev, pos, &header) != PCIBIOS_SUCCESSFUL)
+ if (pci_bus_read_config_dword(bus, devfn, pos, &header) !=
PCIBIOS_SUCCESSFUL)
return 0;
/*
@@ -298,7 +296,7 @@ int pci_find_next_ext_capability(struct pci_dev *dev, int
start, int cap)
if (pos < PCI_CFG_SPACE_SIZE)
break;
- if (pci_read_config_dword(dev, pos, &header) !=
PCIBIOS_SUCCESSFUL)
+ if (pci_bus_read_config_dword(bus, devfn, pos, &header) !=
PCIBIOS_SUCCESSFUL)
break;
}
@@ -322,7 +320,10 @@ EXPORT_SYMBOL_GPL(pci_find_next_ext_capability);
*/
int pci_find_ext_capability(struct pci_dev *dev, int cap)
{
- return pci_find_next_ext_capability(dev, 0, cap);
+ if (dev->cfg_size <= PCI_CFG_SPACE_SIZE)
+ return 0;
+
+ return pci_find_next_ext_capability(dev->bus, dev->devfn, 0, cap);
}
EXPORT_SYMBOL_GPL(pci_find_ext_capability);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index fb57c89..df495e9 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -796,7 +796,7 @@ enum pci_lost_interrupt_reason pci_lost_interrupt(struct
pci_dev *dev);
int pci_find_capability(struct pci_dev *dev, int cap);
int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap);
int pci_find_ext_capability(struct pci_dev *dev, int cap);
-int pci_find_next_ext_capability(struct pci_dev *dev, int pos, int cap);
+int pci_find_next_ext_capability(struct pci_bus *bus, int devfn, int pos, int
cap);
int pci_find_ht_capability(struct pci_dev *dev, int ht_cap);
int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap);
struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
