From e079e5ccc2e707e5b6bd3b011e04c9138f159808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 23 Jan 2019 16:15:48 +0200 Subject: device/pci_ops: Inline PCI config accessors for ramstage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31751 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Nico Huber --- src/device/pci_device.c | 5 +++++ src/device/pci_ops.c | 58 ------------------------------------------------- 2 files changed, 5 insertions(+), 58 deletions(-) (limited to 'src/device') diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 4e51de0713..2233ddca67 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -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; diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c index 362a6ad7c2..bdf8ec4584 100644 --- a/src/device/pci_ops.c +++ b/src/device/pci_ops.c @@ -1,10 +1,6 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2004 Linux Networx - * (Written by Eric Biederman 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 -#include -#include -#include -#include - -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); -} -- cgit v1.2.3