diff -ruN dist+patches-2.4.8/drivers/pci/pci.c cobalt-2.4.8/drivers/pci/pci.c --- dist+patches-2.4.8/drivers/pci/pci.c Wed Jul 4 09:41:34 2001 +++ cobalt-2.4.8/drivers/pci/pci.c Mon Aug 13 16:42:12 2001 @@ -20,6 +20,7 @@ #include #include #include +#include #include /* for hotplug_path */ #include @@ -37,6 +38,8 @@ LIST_HEAD(pci_root_buses); LIST_HEAD(pci_devices); +static int get_bus_speed(struct pci_bus *bus); + /** * pci_find_slot - locate PCI device from a given PCI slot * @bus: number of PCI bus on which desired PCI device resides @@ -1047,6 +1050,7 @@ child->number = child->secondary = busnr; child->primary = parent->secondary; child->subordinate = 0xff; + child->bus_speed = get_bus_speed(child); /* Set up default resource pointers.. */ for (i = 0; i < 4; i++) @@ -1361,6 +1376,7 @@ list_add_tail(&b->node, &pci_root_buses); b->number = b->secondary = bus; + b->bus_speed = get_bus_speed(b); b->resource[0] = &ioport_resource; b->resource[1] = &iomem_resource; return b; @@ -1913,7 +1929,67 @@ return 1; } +#define MAX_OVERRIDES 256 +static int pci_speed_overrides[MAX_OVERRIDES] __initdata; + +static int __init get_bus_speed(struct pci_bus *bus) +{ + if (!bus) { + return -1; + } + + if (pci_speed_overrides[bus->number]) { + return pci_speed_overrides[bus->number]; + } else { + /* printk("PCI: assuming 33 MHz for bus %d\n", bus->number); */ + return 33; + } +} + +/* handle pcispeed=0:33,1:66 parameter (speed=0 means unknown) */ +static int __init pci_speed_setup(char *str) +{ + while (str) { + char *k = strchr(str, ','); + if (k) { + *k++ = '\0'; + } + + if (*str) { + int bus; + int speed; + char *endp; + + if (!isdigit(*str)) { + printk("PCI: bad bus number for " + "pcispeed parameter\n"); + str = k; + continue; + } + bus = simple_strtoul(str, &endp, 0); + + if (!*endp || !isdigit(*(++endp))) { + printk("PCI: bad speed for " + "pcispeed parameter\n"); + str = k; + continue; + } + speed = simple_strtoul(endp, NULL, 0); + pci_speed_overrides[bus] = speed; + printk("PCI: setting bus %d speed to %d MHz\n", + bus, speed); + + str = k; + } else { + break; + } + } + return 1; +} + __setup("pci=", pci_setup); +__setup("pcispeed=", pci_speed_setup); + EXPORT_SYMBOL(pci_read_config_byte); EXPORT_SYMBOL(pci_read_config_word); diff -ruN dist+patches-2.4.8/include/linux/pci.h cobalt-2.4.8/include/linux/pci.h --- dist+patches-2.4.8/include/linux/pci.h Fri Aug 10 18:14:42 2001 +++ cobalt-2.4.8/include/linux/pci.h Mon Aug 13 16:42:50 2001 @@ -1,5 +1,5 @@ /* - * $Id: pci.h,v 1.87 1998/10/11 15:13:12 mj Exp $ + * $Id: pci.h,v 1.1.1.3 2001/04/04 20:08:09 thockin Exp $ * * PCI defines and function prototypes * Copyright 1994, Drew Eckhardt @@ -420,6 +420,7 @@ unsigned char primary; /* number of primary bridge */ unsigned char secondary; /* number of secondary bridge */ unsigned char subordinate; /* max number of subordinate buses */ + int bus_speed; /* the speed of this PCI segment */ char name[48]; unsigned short vendor;