From 754fac43467f87d6b926a181b6150867a08fb9b3 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 2 Feb 2015 15:56:27 +0200 Subject: PCI subsystem: Remove AGP bridge type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no auto-detection for AGP type and we have no hardware that selects this. Furthermore, we treat AGP bridges just like PCI bridges, there is no optimisation for higher bandwidth. Change-Id: I4fe87c83411643cb9b8d3216f2af07bf098174d3 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/8367 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Alexandru Gagniuc Reviewed-by: Patrick Georgi --- src/device/Kconfig | 5 ---- src/device/Makefile.inc | 1 - src/device/agp_device.c | 75 ------------------------------------------------ src/device/pci_device.c | 4 --- src/include/device/agp.h | 14 --------- 5 files changed, 99 deletions(-) delete mode 100644 src/device/agp_device.c delete mode 100644 src/include/device/agp.h (limited to 'src') diff --git a/src/device/Kconfig b/src/device/Kconfig index 532980b78e..91da02a193 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -225,11 +225,6 @@ config PCIEXP_PLUGIN_SUPPORT depends on PCI default y -config AGP_PLUGIN_SUPPORT - bool - depends on PCI - default y - config CARDBUS_PLUGIN_SUPPORT bool depends on PCI diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc index 7fdd9b587d..8c9ba5de05 100644 --- a/src/device/Makefile.inc +++ b/src/device/Makefile.inc @@ -6,7 +6,6 @@ ramstage-$(CONFIG_PCI) += pci_device.c ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.c ramstage-$(CONFIG_PCIX_PLUGIN_SUPPORT) += pcix_device.c ramstage-$(CONFIG_PCIEXP_PLUGIN_SUPPORT) += pciexp_device.c -ramstage-$(CONFIG_AGP_PLUGIN_SUPPORT) += agp_device.c ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += cardbus_device.c ramstage-$(CONFIG_AZALIA_PLUGIN_SUPPORT) += azalia_device.c ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += pnp_device.c diff --git a/src/device/agp_device.c b/src/device/agp_device.c deleted file mode 100644 index 550297afb6..0000000000 --- a/src/device/agp_device.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2005 Linux Networx - * (Written by Eric Biederman for Linux Networx) - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include - -static void agp_tune_dev(device_t dev) -{ - unsigned int cap; - - cap = pci_find_capability(dev, PCI_CAP_ID_AGP); - if (!cap) - return; - - /* The OS is responsible for AGP tuning so do nothing here. */ -} - -unsigned int agp_scan_bus(struct bus *bus, unsigned int min_devfn, - unsigned int max_devfn, unsigned int max) -{ - device_t child; - - max = pci_scan_bus(bus, min_devfn, max_devfn, max); - - for (child = bus->children; child; child = child->sibling) { - if ((child->path.pci.devfn < min_devfn) || - (child->path.pci.devfn > max_devfn)) { - continue; - } - agp_tune_dev(child); - } - - return max; -} - -unsigned int agp_scan_bridge(device_t dev, unsigned int max) -{ - return do_pci_scan_bridge(dev, max, agp_scan_bus); -} - -/** Default device operations for AGP bridges. */ -static struct pci_operations agp_bus_ops_pci = { - .set_subsystem = 0, -}; - -struct device_operations default_agp_ops_bus = { - .read_resources = pci_bus_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_bus_enable_resources, - .init = 0, - .scan_bus = agp_scan_bridge, - .enable = 0, - .reset_bus = pci_bus_reset, - .ops_pci = &agp_bus_ops_pci, -}; diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 862ed0e783..127ee32fe2 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -771,9 +770,6 @@ static struct device_operations *get_pci_bridge_ops(device_t dev) return &default_pcix_ops_bus; } #endif -#if CONFIG_AGP_PLUGIN_SUPPORT - /* How do I detect a PCI to AGP bridge? */ -#endif #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT unsigned int htpos = 0; while ((htpos = pci_find_next_capability(dev, PCI_CAP_ID_HT, htpos))) { diff --git a/src/include/device/agp.h b/src/include/device/agp.h deleted file mode 100644 index be2b833762..0000000000 --- a/src/include/device/agp.h +++ /dev/null @@ -1,14 +0,0 @@ -/* (c) 2005 Linux Networx GPL see COPYING for details */ - -#ifndef DEVICE_AGP_H -#define DEVICE_AGP_H - -#include - -unsigned int agp_scan_bus(struct bus *bus, - unsigned min_devfn, unsigned max_devfn, unsigned int max); -unsigned int agp_scan_bridge(device_t dev, unsigned int max); - -extern struct device_operations default_agp_ops_bus; - -#endif /* DEVICE_AGP_H */ -- cgit v1.2.3