sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/pci_ops: Simplify logic for PCI bus ops

Browse Source 
Nobody ever sets ops_pci_bus. This implies pci_bus_ops() always
returns pci_bus_default_ops() and get_pbus returns NULL.

Change-Id: Ia30d579e1efe6542dc58714f2e7077507847c0de
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31684
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2019-01-23 15:57:13 +02:00
committed by Nico Huber
parent e459a89f0f
commit 6fefdfd106
2 changed files with 20 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/device/pci_ops.c
View File

@@ -15,96 +15,62 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <stdint.h>
#include <console/console.h> #include <console/console.h>
#include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
static const struct pci_bus_operations *pci_bus_ops(struct bus *bus, struct device *dev) static __always_inline const struct pci_bus_operations *pci_bus_ops(void)
{ {
const struct pci_bus_operations *bops; return pci_bus_default_ops();
bops = NULL;
if (bus && bus->dev && bus->dev->ops && bus->dev->ops->ops_pci_bus) {
bops = bus->dev->ops->ops_pci_bus(dev);
}
if (!bops)
bops = pci_bus_default_ops();
return bops;
} }
/* static void pcidev_assert(const struct device *dev)
* The only consumer of the return value of get_pbus() is pci_bus_ops().
* pci_bus_ops() can handle being passed NULL and auto-picks working ops.
*/
static struct bus *get_pbus(struct device *dev)
{ {
struct bus *pbus = NULL; if (dev)
return;
if (!dev) die("PCI: dev is NULL!\n");
die("get_pbus: dev is NULL!\n");
else
pbus = dev->bus;
while (pbus && pbus->dev && !pci_bus_ops(pbus, dev)) {
if (pbus == pbus->dev->bus) {
printk(BIOS_ALERT, "%s in endless loop looking for a "
"parent bus with pci_bus_ops 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) {
/* This can happen before the device tree is fully set up. */
// printk(BIOS_EMERG, "%s: Cannot find PCI bus operations.\n",
// dev_path(dev));
pbus = NULL;
}
return pbus;
} }
u8 pci_read_config8(struct device *dev, unsigned int where) u8 pci_read_config8(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); pcidev_assert(dev);
return pci_bus_ops(pbus, dev)->read8(dev->bus->secondary, return pci_bus_ops()->read8(dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
u16 pci_read_config16(struct device *dev, unsigned int where) u16 pci_read_config16(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); pcidev_assert(dev);
return pci_bus_ops(pbus, dev)->read16(dev->bus->secondary, return pci_bus_ops()->read16(dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
u32 pci_read_config32(struct device *dev, unsigned int where) u32 pci_read_config32(struct device *dev, unsigned int where)
{ {
struct bus *pbus = get_pbus(dev); pcidev_assert(dev);
return pci_bus_ops(pbus, dev)->read32(dev->bus->secondary, return pci_bus_ops()->read32(dev->bus->secondary,
dev->path.pci.devfn, where); dev->path.pci.devfn, where);
} }
void pci_write_config8(struct device *dev, unsigned int where, u8 val) void pci_write_config8(struct device *dev, unsigned int where, u8 val)
{ {
struct bus *pbus = get_pbus(dev); pcidev_assert(dev);
pci_bus_ops(pbus, dev)->write8(dev->bus->secondary, pci_bus_ops()->write8(dev->bus->secondary,
dev->path.pci.devfn, where, val); dev->path.pci.devfn, where, val);
} }
void pci_write_config16(struct device *dev, unsigned int where, u16 val) void pci_write_config16(struct device *dev, unsigned int where, u16 val)
{ {
struct bus *pbus = get_pbus(dev); pcidev_assert(dev);
pci_bus_ops(pbus, dev)->write16(dev->bus->secondary, pci_bus_ops()->write16(dev->bus->secondary,
dev->path.pci.devfn, where, val); dev->path.pci.devfn, where, val);
} }
void pci_write_config32(struct device *dev, unsigned int where, u32 val) void pci_write_config32(struct device *dev, unsigned int where, u32 val)
{ {
struct bus *pbus = get_pbus(dev); pcidev_assert(dev);
pci_bus_ops(pbus, dev)->write32(dev->bus->secondary, pci_bus_ops()->write32(dev->bus->secondary,
dev->path.pci.devfn, where, val); dev->path.pci.devfn, where, val);
} }

1
src/include/device/device.h
View File

@@ -68,7 +68,6 @@ struct device_operations {
const struct i2c_bus_operations *ops_i2c_bus; const struct i2c_bus_operations *ops_i2c_bus;
const struct spi_bus_operations *ops_spi_bus; const struct spi_bus_operations *ops_spi_bus;
const struct smbus_bus_operations *ops_smbus_bus; const struct smbus_bus_operations *ops_smbus_bus;
const struct pci_bus_operations * (*ops_pci_bus)(struct device *dev);
const struct pnp_mode_ops *ops_pnp_mode; const struct pnp_mode_ops *ops_pnp_mode;
}; };