pci: Add a function to find a device by class

[platform/kernel/u-boot.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 3daf73c..e1296ca 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -15,10 +15,13 @@
 #include <common.h>
 
 #include <command.h>
+#include <errno.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #define PCI_HOSE_OP(rw, size, type)                                    \
 int pci_hose_##rw##_config_##size(struct pci_controller *hose,         \
                                  pci_dev_t dev,                        \
@@ -123,6 +126,14 @@ void *pci_map_bar(pci_dev_t pdev, int bar, int flags)
 
 static struct pci_controller* hose_head;
 
+struct pci_controller *pci_get_hose_head(void)
+{
+       if (gd->hose)
+               return gd->hose;
+
+       return hose_head;
+}
+
 void pci_register_hose(struct pci_controller* hose)
 {
        struct pci_controller **phose = &hose_head;
@@ -139,7 +150,7 @@ struct pci_controller *pci_bus_to_hose(int bus)
 {
        struct pci_controller *hose;
 
-       for (hose = hose_head; hose; hose = hose->next) {
+       for (hose = pci_get_hose_head(); hose; hose = hose->next) {
                if (bus >= hose->first_busno && bus <= hose->last_busno)
                        return hose;
        }
@@ -152,7 +163,7 @@ struct pci_controller *find_hose_by_cfg_addr(void *cfg_addr)
 {
        struct pci_controller *hose;
 
-       for (hose = hose_head; hose; hose = hose->next) {
+       for (hose = pci_get_hose_head(); hose; hose = hose->next) {
                if (hose->cfg_addr == cfg_addr)
                        return hose;
        }
@@ -162,7 +173,7 @@ struct pci_controller *find_hose_by_cfg_addr(void *cfg_addr)
 
 int pci_last_busno(void)
 {
-       struct pci_controller *hose = hose_head;
+       struct pci_controller *hose = pci_get_hose_head();
 
        if (!hose)
                return -1;
@@ -181,19 +192,14 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
        pci_dev_t bdf;
        int i, bus, found_multi = 0;
 
-       for (hose = hose_head; hose; hose = hose->next) {
+       for (hose = pci_get_hose_head(); hose; hose = hose->next) {
 #ifdef CONFIG_SYS_SCSI_SCAN_BUS_REVERSE
                for (bus = hose->last_busno; bus >= hose->first_busno; bus--)
 #else
                for (bus = hose->first_busno; bus <= hose->last_busno; bus++)
 #endif
                        for (bdf = PCI_BDF(bus, 0, 0);
-#if defined(CONFIG_ELPPC) || defined(CONFIG_PPMC7XX)
-                            bdf < PCI_BDF(bus, PCI_MAX_PCI_DEVICES - 1,
-                               PCI_MAX_PCI_FUNCTIONS - 1);
-#else
                             bdf < PCI_BDF(bus + 1, 0, 0);
-#endif
                             bdf += PCI_BDF(0, 0, 1)) {
                                if (pci_skip_dev(hose, bdf))
                                        continue;
@@ -231,9 +237,51 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
        return -1;
 }
 
+pci_dev_t pci_find_class(uint find_class, int index)
+{
+       int bus;
+       int devnum;
+       pci_dev_t bdf;
+       uint32_t class;
+
+       for (bus = 0; bus <= pci_last_busno(); bus++) {
+               for (devnum = 0; devnum < PCI_MAX_PCI_DEVICES - 1; devnum++) {
+                       pci_read_config_dword(PCI_BDF(bus, devnum, 0),
+                                             PCI_CLASS_REVISION, &class);
+                       if (class >> 16 == 0xffff)
+                               continue;
+
+                       for (bdf = PCI_BDF(bus, devnum, 0);
+                                       bdf <= PCI_BDF(bus, devnum,
+                                               PCI_MAX_PCI_FUNCTIONS - 1);
+                                       bdf += PCI_BDF(0, 0, 1)) {
+                               pci_read_config_dword(bdf, PCI_CLASS_REVISION,
+                                                     &class);
+                               class >>= 8;
+
+                               if (class != find_class)
+                                       continue;
+                               /*
+                                * Decrement the index. We want to return the
+                                * correct device, so index is 0 for the first
+                                * matching device, 1 for the second, etc.
+                                */
+                               if (index) {
+                                       index--;
+                                       continue;
+                               }
+                               /* Return index'th controller. */
+                               return bdf;
+                       }
+               }
+       }
+
+       return -ENODEV;
+}
+
 pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index)
 {
-       static struct pci_device_id ids[2] = {{}, {0, 0}};
+       struct pci_device_id ids[2] = { {}, {0, 0} };
 
        ids[0].vendor = vendor;
        ids[0].device = device;
@@ -709,11 +757,10 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
 int pci_hose_scan(struct pci_controller *hose)
 {
 #if defined(CONFIG_PCI_BOOTDELAY)
-       static int pcidelay_done;
        char *s;
        int i;
 
-       if (!pcidelay_done) {
+       if (!gd->pcidelay_done) {
                /* wait "pcidelay" ms (if defined)... */
                s = getenv("pcidelay");
                if (s) {
@@ -721,7 +768,7 @@ int pci_hose_scan(struct pci_controller *hose)
                        for (i = 0; i < val; i++)
                                udelay(1000);
                }
-               pcidelay_done = 1;
+               gd->pcidelay_done = 1;
        }
 #endif /* CONFIG_PCI_BOOTDELAY */