Author: stepan
Date: 2007-05-20 19:53:19 +0200 (Sun, 20 May 2007)
New Revision: 328
Added:
LinuxBIOSv3/device/pcie_device.c
Removed:
LinuxBIOSv3/device/pciexp_device.c
Modified:
LinuxBIOSv3/device/pcix_device.c
Log:
fix output in pcie and pcix device code. rename pciexp as the official abbr. is
PCIe (not used anywhere yet anyways)
Signed-off-by: Stefan Reinauer <[EMAIL PROTECTED]>
Acked-by: Stefan Reinauer <[EMAIL PROTECTED]>
Copied: LinuxBIOSv3/device/pcie_device.c (from rev 327,
LinuxBIOSv3/device/pciexp_device.c)
===================================================================
--- LinuxBIOSv3/device/pcie_device.c (rev 0)
+++ LinuxBIOSv3/device/pcie_device.c 2007-05-20 17:53:19 UTC (rev 328)
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * Copyright (C) 2005 Linux Networx
+ * (Written by Eric Biederman <[EMAIL PROTECTED]> 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 <console.h>
+#include <device/device.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <device/pciexp.h>
+
+static void pciexp_tune_dev(struct device *dev)
+{
+ unsigned int cap;
+ cap = pci_find_capability(dev, PCI_CAP_ID_PCIE);
+ if (!cap) {
+ /* error... */
+ return;
+ }
+ printk(BIOS_DEBUG, "PCIe: tuning %s\n", dev_path(dev));
+#warning "IMPLEMENT PCI EXPRESS TUNING"
+}
+
+unsigned int pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
+ unsigned int max_devfn, unsigned int max)
+{
+ struct device *child;
+ max = pci_scan_bus(bus, min_devfn, max_devfn, max);
+ for (child = bus->children; child; child = child->sibling) {
+ if ((child->path.u.pci.devfn < min_devfn) ||
+ (child->path.u.pci.devfn > max_devfn)) {
+ continue;
+ }
+ pciexp_tune_dev(child);
+ }
+ return max;
+}
+
+unsigned int pciexp_scan_bridge(struct device *dev, unsigned int max)
+{
+ return do_pci_scan_bridge(dev, max, pciexp_scan_bus);
+}
+
+/** Default device operations for PCI Express bridges. */
+static struct pci_operations pciexp_bus_ops_pci = {
+ .set_subsystem = 0,
+};
+
+struct device_operations default_pciexp_ops_bus = {
+ .read_resources = pci_bus_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_bus_enable_resources,
+ .init = 0,
+ .scan_bus = pciexp_scan_bridge,
+ .enable = 0,
+ .reset_bus = pci_bus_reset,
+ .ops_pci = &pciexp_bus_ops_pci,
+};
Deleted: LinuxBIOSv3/device/pciexp_device.c
===================================================================
--- LinuxBIOSv3/device/pciexp_device.c 2007-05-19 23:55:25 UTC (rev 327)
+++ LinuxBIOSv3/device/pciexp_device.c 2007-05-20 17:53:19 UTC (rev 328)
@@ -1,73 +0,0 @@
-/*
- * This file is part of the LinuxBIOS project.
- *
- * Copyright (C) 2005 Linux Networx
- * (Written by Eric Biederman <[EMAIL PROTECTED]> 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 <console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pciexp.h>
-
-static void pciexp_tune_dev(struct device *dev)
-{
- unsigned int cap;
- cap = pci_find_capability(dev, PCI_CAP_ID_PCIE);
- if (!cap) {
- /* error... */
- return;
- }
- printk(BIOS_DEBUG, "PCIEXP: tuning %s\n", dev_path(dev));
-#warning "IMPLEMENT PCI EXPRESS TUNING"
-}
-
-unsigned int pciexp_scan_bus(struct bus *bus, unsigned int min_devfn,
- unsigned int max_devfn, unsigned int max)
-{
- struct device *child;
- max = pci_scan_bus(bus, min_devfn, max_devfn, max);
- for (child = bus->children; child; child = child->sibling) {
- if ((child->path.u.pci.devfn < min_devfn) ||
- (child->path.u.pci.devfn > max_devfn)) {
- continue;
- }
- pciexp_tune_dev(child);
- }
- return max;
-}
-
-unsigned int pciexp_scan_bridge(struct device *dev, unsigned int max)
-{
- return do_pci_scan_bridge(dev, max, pciexp_scan_bus);
-}
-
-/** Default device operations for PCI Express bridges. */
-static struct pci_operations pciexp_bus_ops_pci = {
- .set_subsystem = 0,
-};
-
-struct device_operations default_pciexp_ops_bus = {
- .read_resources = pci_bus_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_bus_enable_resources,
- .init = 0,
- .scan_bus = pciexp_scan_bridge,
- .enable = 0,
- .reset_bus = pci_bus_reset,
- .ops_pci = &pciexp_bus_ops_pci,
-};
Modified: LinuxBIOSv3/device/pcix_device.c
===================================================================
--- LinuxBIOSv3/device/pcix_device.c 2007-05-19 23:55:25 UTC (rev 327)
+++ LinuxBIOSv3/device/pcix_device.c 2007-05-20 17:53:19 UTC (rev 328)
@@ -129,7 +129,7 @@
}
/* Print the PCI-X bus speed. */
- printk(BIOS_DEBUG, "PCI: %02x: %s\n", dev->link[0].secondary,
+ printk(BIOS_DEBUG, "PCI-X: %02x: %s\n", dev->link[0].secondary,
pcix_speed(sstatus));
return max;
--
linuxbios mailing list
[email protected]
http://www.linuxbios.org/mailman/listinfo/linuxbios
