Various Doxygen comment fixes, typo fixes, etc.

[coreboot.git] / src / devices / pci_ops.c

diff --git a/src/devices/pci_ops.c b/src/devices/pci_ops.c
index 032c900cb9e702e5a416b02263abf996ab9ad11d..c3237dbdbfde98fd9db61bd71a02b282ec1103db 100644 (file)
--- a/src/devices/pci_ops.c
+++ b/src/devices/pci_ops.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2004 Linux Networx
  * (Written by Eric Biederman <ebiederman@lnxi.com> for Linux Networx)
+ * Copyright (C) 2009 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,16 +25,32 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 
+/*
+ * The only consumer of the return value of get_pbus() is ops_pci_bus().
+ * ops_pci_bus() can handle being passed NULL and auto-picks working ops.
+ */
 static struct bus *get_pbus(device_t dev)
 {
-       struct bus *pbus = dev->bus;
+       struct bus *pbus = NULL;
+
+       if (!dev)
+               die("get_pbus: dev is NULL!\n");
+       else
+               pbus = dev->bus;
+
        while(pbus && pbus->dev && !ops_pci_bus(pbus)) {
+               if (pbus == pbus->dev->bus) {
+                       printk(BIOS_ALERT, "%s in endless loop looking for a parent "
+                               "bus with ops_pci_bus for %s, breaking out.\n",
+                                __func__, dev_path(dev));
+                       break;
+               }
                pbus = pbus->dev->bus;
        }
        if (!pbus || !pbus->dev || !pbus->dev->ops || !pbus->dev->ops->ops_pci_bus) {
-               printk_alert("%s Cannot find pci bus operations", dev_path(dev));
-               die("");
-               for(;;);
+               /* This can happen before the device tree is set up completely. */
+               //printk(BIOS_EMERG, "%s: Cannot find pci bus operations.\n", dev_path(dev));
+               pbus = NULL;
        }
        return pbus;
 }
@@ -41,35 +58,73 @@ static struct bus *get_pbus(device_t dev)
 uint8_t pci_read_config8(device_t dev, unsigned where)
 {
        struct bus *pbus = get_pbus(dev);
-       return ops_pci_bus(pbus)->read8(pbus, dev->bus->secondary, dev->path.u.pci.devfn, where);
+       return ops_pci_bus(pbus)->read8(pbus, dev->bus->secondary, dev->path.pci.devfn, where);
 }
 
 uint16_t pci_read_config16(device_t dev, unsigned where)
 {
        struct bus *pbus = get_pbus(dev);
-       return ops_pci_bus(pbus)->read16(pbus, dev->bus->secondary, dev->path.u.pci.devfn, where);
+       return ops_pci_bus(pbus)->read16(pbus, dev->bus->secondary, dev->path.pci.devfn, where);
 }
 
 uint32_t pci_read_config32(device_t dev, unsigned where)
 {
        struct bus *pbus = get_pbus(dev);
-       return ops_pci_bus(pbus)->read32(pbus, dev->bus->secondary, dev->path.u.pci.devfn, where);
+       return ops_pci_bus(pbus)->read32(pbus, dev->bus->secondary, dev->path.pci.devfn, where);
 }
 
 void pci_write_config8(device_t dev, unsigned where, uint8_t val)
 {
        struct bus *pbus = get_pbus(dev);
-       ops_pci_bus(pbus)->write8(pbus, dev->bus->secondary, dev->path.u.pci.devfn, where, val);
+       ops_pci_bus(pbus)->write8(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val);
 }
 
 void pci_write_config16(device_t dev, unsigned where, uint16_t val)
 {
        struct bus *pbus = get_pbus(dev);
-       ops_pci_bus(pbus)->write16(pbus, dev->bus->secondary, dev->path.u.pci.devfn, where, val);
+       ops_pci_bus(pbus)->write16(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val);
 }
 
 void pci_write_config32(device_t dev, unsigned where, uint32_t val)
 {
        struct bus *pbus = get_pbus(dev);
-       ops_pci_bus(pbus)->write32(pbus, dev->bus->secondary, dev->path.u.pci.devfn, where, val);
+       ops_pci_bus(pbus)->write32(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val);
+}
+
+#if CONFIG_MMCONF_SUPPORT
+uint8_t pci_mmio_read_config8(device_t dev, unsigned where)
+{
+       struct bus *pbus = get_pbus(dev);
+       return pci_ops_mmconf.read8(pbus, dev->bus->secondary, dev->path.pci.devfn, where);
+}
+
+uint16_t pci_mmio_read_config16(device_t dev, unsigned where)
+{
+       struct bus *pbus = get_pbus(dev);
+       return pci_ops_mmconf.read16(pbus, dev->bus->secondary, dev->path.pci.devfn, where);
+}
+
+uint32_t pci_mmio_read_config32(device_t dev, unsigned where)
+{
+       struct bus *pbus = get_pbus(dev);
+       return pci_ops_mmconf.read32(pbus, dev->bus->secondary, dev->path.pci.devfn, where);
+}
+
+void pci_mmio_write_config8(device_t dev, unsigned where, uint8_t val)
+{
+       struct bus *pbus = get_pbus(dev);
+       pci_ops_mmconf.write8(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val);
+}
+
+void pci_mmio_write_config16(device_t dev, unsigned where, uint16_t val)
+{
+       struct bus *pbus = get_pbus(dev);
+       pci_ops_mmconf.write16(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val);
+}
+
+void pci_mmio_write_config32(device_t dev, unsigned where, uint32_t val)
+{
+       struct bus *pbus = get_pbus(dev);
+       pci_ops_mmconf.write32(pbus, dev->bus->secondary, dev->path.pci.devfn, where, val);
 }
+#endif