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

device/pci_ops: Inline PCI config accessors for ramstage

Browse Source 
Inlining here allows the check for (dev != NULL) to be
optimised and evaluated just once inside the calling
function body.

Change-Id: I0b5b4f4adb8eaa483a31353324da19917db85f4a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31751
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Kyösti Mälkki
2019-01-23 16:15:48 +02:00
committed by Nico Huber
parent ad7758ca52
commit e079e5ccc2
3 changed files with 81 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/device/pci_device.c
View File

@ -693,6 +693,11 @@ void pci_dev_enable_resources(struct device *dev)
pci_write_config16(dev, PCI_COMMAND, command);
}
void __noreturn pcidev_die(void)
{
die("PCI: dev is NULL!\n");
}
void pci_bus_enable_resources(struct device *dev)
{
u16 ctrl;

58
src/device/pci_ops.c
View File

@ -1,10 +1,6 @@
/*
* This file is part of the coreboot project.
*
* 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
* the Free Software Foundation; version 2 of the License.
@ -14,57 +10,3 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <stdint.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
static __always_inline const struct pci_bus_operations *pci_bus_ops(void)
{
return pci_bus_default_ops();
}
static void pcidev_assert(const struct device *dev)
{
if (dev)
return;
die("PCI: dev is NULL!\n");
}
u8 pci_read_config8(struct device *dev, unsigned int where)
{
pcidev_assert(dev);
return pci_bus_ops()->read8(dev, where);
}
u16 pci_read_config16(struct device *dev, unsigned int where)
{
pcidev_assert(dev);
return pci_bus_ops()->read16(dev, where);
}
u32 pci_read_config32(struct device *dev, unsigned int where)
{
pcidev_assert(dev);
return pci_bus_ops()->read32(dev, where);
}
void pci_write_config8(struct device *dev, unsigned int where, u8 val)
{
pcidev_assert(dev);
pci_bus_ops()->write8(dev, where, val);
}
void pci_write_config16(struct device *dev, unsigned int where, u16 val)
{
pcidev_assert(dev);
pci_bus_ops()->write16(dev, where, val);
}
void pci_write_config32(struct device *dev, unsigned int where, u32 val)
{
pcidev_assert(dev);
pci_bus_ops()->write32(dev, where, val);
}

82
src/include/device/pci_ops.h
View File

@ -1,3 +1,20 @@
/*
* This file is part of the coreboot project.
*
* 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
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef PCI_OPS_H
#define PCI_OPS_H
@ -19,13 +36,66 @@
#define pci_write_config16 pci_s_write_config16
#define pci_write_config32 pci_s_write_config32
#else
u8 pci_read_config8(struct device *dev, unsigned int where);
u16 pci_read_config16(struct device *dev, unsigned int where);
u32 pci_read_config32(struct device *dev, unsigned int where);
void pci_write_config8(struct device *dev, unsigned int where, u8 val);
void pci_write_config16(struct device *dev, unsigned int where, u16 val);
void pci_write_config32(struct device *dev, unsigned int where, u32 val);
#include <device/pci.h>
const struct pci_bus_operations *pci_bus_default_ops(void);
static __always_inline const struct pci_bus_operations *pci_bus_ops(void)
{
return pci_bus_default_ops();
}
void __noreturn pcidev_die(void);
static __always_inline void pcidev_assert(const struct device *dev)
{
if (!dev)
pcidev_die();
}
static __always_inline
u8 pci_read_config8(struct device *dev, unsigned int where)
{
pcidev_assert(dev);
return pci_bus_ops()->read8(dev, where);
}
static __always_inline
u16 pci_read_config16(struct device *dev, unsigned int where)
{
pcidev_assert(dev);
return pci_bus_ops()->read16(dev, where);
}
static __always_inline
u32 pci_read_config32(struct device *dev, unsigned int where)
{
pcidev_assert(dev);
return pci_bus_ops()->read32(dev, where);
}
static __always_inline
void pci_write_config8(struct device *dev, unsigned int where, u8 val)
{
pcidev_assert(dev);
pci_bus_ops()->write8(dev, where, val);
}
static __always_inline
void pci_write_config16(struct device *dev, unsigned int where, u16 val)
{
pcidev_assert(dev);
pci_bus_ops()->write16(dev, where, val);
}
static __always_inline
void pci_write_config32(struct device *dev, unsigned int where, u32 val)
{
pcidev_assert(dev);
pci_bus_ops()->write32(dev, where, val);
}
#endif
#ifdef __SIMPLE_DEVICE__