diff options
Diffstat (limited to 'src')
85 files changed, 240 insertions, 515 deletions
diff --git a/src/arch/i386/init/crt0.S.lb b/src/arch/i386/init/crt0.S.lb index 4d9face092..29e3e28277 100644 --- a/src/arch/i386/init/crt0.S.lb +++ b/src/arch/i386/init/crt0.S.lb @@ -37,12 +37,21 @@ #include "crt0_includes.h" + /* uses: esp, ebx, ax, dx */ +#define __CONSOLE_TX_STRING(string) \ + mov string, %ebx ; \ + CALLSP(console_tx_string) + +#if ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG +#define CONSOLE_DEBUG_TX_STRING(string) __CONSOLE_TX_STRING(string) +#else +#define CONSOLE_DEBUG_TX_STRING(string) +#endif /* clear boot_complete flag */ xorl %ebp, %ebp __main: - mov $str_copying_to_ram, %ebx - CALLSP(console_tx_string) + CONSOLE_DEBUG_TX_STRING($str_copying_to_ram) /* * Copy data into RAM and clear the BSS. Since these segments @@ -149,8 +158,7 @@ decompr_end_n2b: movl %esp, %ebp #endif - mov $str_pre_main, %ebx - CALLSP(console_tx_string) + CONSOLE_DEBUG_TX_STRING($str_pre_main) leal _iseg, %edi jmp %edi @@ -159,12 +167,9 @@ decompr_end_n2b: hlt jmp .Lhlt - +#if ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG /* Uses esp, ebx, ax, dx */ console_tx_string: -#if ASM_CONSOLE_LOGLEVEL <= BIOS_DEBUG - RETSP -#else mov (%ebx), %al inc %ebx cmp $0, %al @@ -210,4 +215,3 @@ str_pre_main: .string "Jumping to LinuxBIOS.\r\n" .previous #endif /* ASM_CONSOLE_LOGLEVEL > BIOS_DEBUG */ -
\ No newline at end of file diff --git a/src/arch/i386/smp/mpspec.c b/src/arch/i386/smp/mpspec.c index babfcbdca2..c674cf58f5 100644 --- a/src/arch/i386/smp/mpspec.c +++ b/src/arch/i386/smp/mpspec.c @@ -1,4 +1,6 @@ #include <console/console.h> +#include <device/device.h> +#include <device/path.h> #include <cpu/cpu.h> #include <arch/smp/mpspec.h> #include <string.h> @@ -101,14 +103,17 @@ void smp_write_processors(struct mp_config_table *mc) unsigned cpu_feature_flags; struct cpuid_result result; device_t cpu; + boot_apic_id = lapicid(); apic_version = lapic_read(LAPIC_LVR) & 0xff; result = cpuid(1); cpu_features = result.eax; cpu_feature_flags = result.edx; - for(cpu = dev_root.link[1].children; cpu; cpu = cpu->sibling) { + for(cpu = all_devices; cpu; cpu = cpu->next) { unsigned long cpu_flag; - if (cpu->path.type != DEVICE_PATH_APIC) { + if ((cpu->path.type != DEVICE_PATH_APIC) || + (cpu->bus->dev->path.type != DEVICE_PATH_APIC_CLUSTER)) + { continue; } if (!cpu->enabled) { diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index d292e5dcd4..ecff677c88 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -32,7 +32,6 @@ it with the version available from LANL. #include <boot/tables.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <delay.h> #include <stdlib.h> #include <part/hard_reset.h> @@ -52,8 +51,6 @@ void hardwaremain(int boot_complete) post_code(0x80); - CONFIGURE(CONF_PASS_PRE_CONSOLE); - /* displayinit MUST PRECEDE ALL PRINTK! */ console_init(); @@ -69,13 +66,13 @@ void hardwaremain(int boot_complete) hard_reset(); } - CONFIGURE(CONF_PASS_PRE_PCI); + /* FIXME: Is there a better way to handle this? */ + init_timer(); /* pick how to scan the bus. This is first so we can get at memory size. */ printk_info("Finding PCI configuration type.\n"); pci_set_method(); post_code(0x5f); - enumerate_static_devices(); dev_enumerate(); post_code(0x66); /* Now do the real bus. @@ -90,15 +87,11 @@ void hardwaremain(int boot_complete) dev_initialize(); post_code(0x89); - CONFIGURE(CONF_PASS_POST_PCI); - /* Now that we have collected all of our information * write our configuration tables. */ lb_mem = write_tables(); - CONFIGURE(CONF_PASS_PRE_BOOT); - #if CONFIG_FS_STREAM == 1 filo(lb_mem); #else diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index e2c864f06a..c0915fc523 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -3,7 +3,6 @@ #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/device.h> -#include <device/chip.h> #include <device/device.h> #include <device/pci.h> #include <string.h> diff --git a/src/cpu/amd/socket_940/chip.h b/src/cpu/amd/socket_940/chip.h index 69002a27f1..7154dd1593 100644 --- a/src/cpu/amd/socket_940/chip.h +++ b/src/cpu/amd/socket_940/chip.h @@ -1,4 +1,4 @@ -extern struct chip_control cpu_amd_socket_940_control; +extern struct chip_operations cpu_amd_socket_940_ops; struct cpu_amd_socket_940_config { }; diff --git a/src/cpu/amd/socket_940/socket_940.c b/src/cpu/amd/socket_940/socket_940.c index 91bfc37ec8..d62834f4e7 100644 --- a/src/cpu/amd/socket_940/socket_940.c +++ b/src/cpu/amd/socket_940/socket_940.c @@ -1,7 +1,7 @@ -#include <device/chip.h> +#include <device/device.h> #include "chip.h" -struct chip_control cpu_amd_socket_940_control = { +struct chip_operations cpu_amd_socket_940_ops = { .name = "socket 940", }; diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c index 95be3b701c..43baf6e346 100644 --- a/src/cpu/intel/model_6xx/model_6xx_init.c +++ b/src/cpu/intel/model_6xx/model_6xx_init.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/device.h> #include <device/pci.h> #include <string.h> diff --git a/src/cpu/intel/model_f0x/model_f0x_init.c b/src/cpu/intel/model_f0x/model_f0x_init.c index ef64688625..55504a1049 100644 --- a/src/cpu/intel/model_f0x/model_f0x_init.c +++ b/src/cpu/intel/model_f0x/model_f0x_init.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/device.h> #include <device/pci.h> #include <string.h> diff --git a/src/cpu/intel/model_f1x/model_f1x_init.c b/src/cpu/intel/model_f1x/model_f1x_init.c index 4045345d35..53cee4fe68 100644 --- a/src/cpu/intel/model_f1x/model_f1x_init.c +++ b/src/cpu/intel/model_f1x/model_f1x_init.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/device.h> #include <device/pci.h> #include <string.h> diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c index ecc454c974..db8dc184e3 100644 --- a/src/cpu/intel/model_f2x/model_f2x_init.c +++ b/src/cpu/intel/model_f2x/model_f2x_init.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/device.h> #include <device/pci.h> #include <string.h> diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c index ce5705b081..a89e7d1782 100644 --- a/src/cpu/intel/model_f3x/model_f3x_init.c +++ b/src/cpu/intel/model_f3x/model_f3x_init.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/device.h> #include <device/pci.h> #include <string.h> diff --git a/src/cpu/intel/slot_2/slot_2.c b/src/cpu/intel/slot_2/slot_2.c index f47767b016..2d4fb9373c 100644 --- a/src/cpu/intel/slot_2/slot_2.c +++ b/src/cpu/intel/slot_2/slot_2.c @@ -1,4 +1,4 @@ -#include <device/chip.h> +#include <device/device.h> #include "chip.h" diff --git a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c index 73265eab1f..8d736bbc79 100644 --- a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c +++ b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c @@ -1,4 +1,4 @@ -#include <device/chip.h> +#include <device/device.h> #include "chip.h" diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c index fd5dbe41d5..6dc325ce0b 100644 --- a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c +++ b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c @@ -1,4 +1,4 @@ -#include <device/chip.h> +#include <device/device.h> #include "chip.h" diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c index c638a93874..3d82276d05 100644 --- a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c +++ b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c @@ -1,4 +1,4 @@ -#include <device/chip.h> +#include <device/device.h> #include "chip.h" diff --git a/src/cpu/simple_init/simple_cpu_init.c b/src/cpu/simple_init/simple_cpu_init.c index 39b5832971..02eb73f391 100644 --- a/src/cpu/simple_init/simple_cpu_init.c +++ b/src/cpu/simple_init/simple_cpu_init.c @@ -7,7 +7,7 @@ #error "This Configuration does not support SMP" #endif -void initialize_cpus(device_t root) +void initialize_cpus(struct bus *cpu_bus) { struct device_path cpu_path; struct cpu_info *info; @@ -19,7 +19,7 @@ void initialize_cpus(device_t root) cpu_path.type = DEVICE_PATH_BOOT_CPU; /* Find the device struct for the boot cpu */ - info->cpu = alloc_find_dev(root->link[1], &cpu_path); + info->cpu = alloc_find_dev(bus, &cpu_path); /* Initialize the bootstrap processor */ cpu_initialize(); diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 963b1cf729..db0cecbd06 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -234,12 +234,12 @@ void secondary_cpu_init(void) stop_this_cpu(); } -static void initialize_other_cpus(device_t root) +static void initialize_other_cpus(struct bus *cpu_bus) { int old_active_count, active_count; device_t cpu; /* Loop through the cpus once getting them started */ - for(cpu = root->link[1].children; cpu ; cpu = cpu->sibling) { + for(cpu = cpu_bus->children; cpu ; cpu = cpu->sibling) { if (cpu->path.type != DEVICE_PATH_APIC) { continue; } @@ -267,7 +267,7 @@ static void initialize_other_cpus(device_t root) udelay(10); active_count = atomic_read(&active_cpus); } - for(cpu = root->link[1].children; cpu; cpu = cpu->sibling) { + for(cpu = cpu_bus->children; cpu; cpu = cpu->sibling) { if (cpu->path.type != DEVICE_PATH_APIC) { continue; } @@ -284,7 +284,7 @@ static void initialize_other_cpus(device_t root) #define initialize_other_cpus(root) do {} while(0) #endif /* CONFIG_SMP */ -void initialize_cpus(device_t root) +void initialize_cpus(struct bus *cpu_bus) { struct device_path cpu_path; struct cpu_info *info; @@ -305,12 +305,12 @@ void initialize_cpus(device_t root) #endif /* Find the device structure for the boot cpu */ - info->cpu = alloc_find_dev(&root->link[1], &cpu_path); + info->cpu = alloc_find_dev(cpu_bus, &cpu_path); /* Initialize the bootstrap processor */ cpu_initialize(); /* Now initialize the rest of the cpus */ - initialize_other_cpus(root); + initialize_other_cpus(cpu_bus); } diff --git a/src/devices/Config.lb b/src/devices/Config.lb index 50d05579e5..80b64a0d44 100644 --- a/src/devices/Config.lb +++ b/src/devices/Config.lb @@ -4,4 +4,3 @@ object device_util.o object pci_device.o object pnp_device.o object hypertransport.o -object chip.o diff --git a/src/devices/chip.c b/src/devices/chip.c deleted file mode 100644 index 6882a4b797..0000000000 --- a/src/devices/chip.c +++ /dev/null @@ -1,232 +0,0 @@ -/* chips are arbitrary chips (superio, southbridge, etc.) - * They have private structures that define chip resources and default - * settings. They have four externally visible functions for control. - * They have a generic component which applies to all chips for - * path, etc. - */ - -#include <console/console.h> -#include <device/chip.h> -#include <device/pci.h> - -/** - * @brief Configure static devices - * - * Starting from the static device 'root', walk the tree and configure each - * device by calling the device specific chip_control::enable(). - * - * This function is only an iterator, the exact definition of 'configure' - * depends on the device specific implementation of chip_control::enable(). - * - * @param root root of the static device tree to be configured. - * @param pass pass of the configuration operation to be perfromed. - * - * @see chip_pass - * @see chip_control::enable - */ -void chip_configure(struct chip *root, enum chip_pass pass) -{ - struct chip *c; - - for (c = root; c; c = c->next) { - if (c->control && c->control->enable) - c->control->enable(c, pass); - } - - for (c = root; c; c = c->next) { - if (c->children) - chip_configure(c->children, pass); - } -} - -/** - * @brief Convert static device structures to dynamic structures. - * - * A static device may contain one or more dynamic devices. Dynamic device - * structures of these devices have to be generated before the enumeration - * of dynamic devices. This function converts a static chip structure to a - * set of dynamic device structures. - * - * This function is the generic method called by enumerate_static_device_chain() - * for static devices. Devices extend this default behavior by defining their - * own chip_controll::enumerate(). Generally, device specific - * chip_control::enumerate() method calls this function as its last operation. - * - * @param chip static chip structure to be converted. - * - */ -void chip_enumerate(struct chip *chip) -{ - struct chip *child; - device_t dev; - int link; - int i; - - dev = 0; - link = 0; - - if (chip->control && chip->control->name) { - printk_debug("Enumerating: %s\n", chip->control->name); - } - - for(i = 0; i < MAX_CHIP_PATHS; i++) { - int identical_paths; - identical_paths = - (i > 0) && - (path_eq(&chip->path[i - 1].path, &chip->path[i].path)); - if (!identical_paths) { - struct bus *parent; - int bus; - link = 0; - dev = 0; - parent = chip->bus; - switch(chip->path[i].path.type) { - case DEVICE_PATH_NONE: - /* no dynamic device associated */ - break; - case DEVICE_PATH_PCI: - bus = chip->path[i].path.u.pci.bus; - if (bus != 0) { - device_t dev; - int i = 1; - dev = chip->dev; - while(dev && (i != bus)) { - dev = dev->next; - i++; - } - if ((i == bus) && dev) { - parent = &dev->link[0]; - } - } - /* Fall through */ - default: - dev = alloc_dev(parent, &chip->path[i].path); - break; - } - } - else { - link += 1; - } - - if (dev) { - struct chip_resource *res, *res_limit; - printk_spew("path (%p) %s %s", - dev, dev_path(dev), identical_paths?"identical":""); - printk_spew(" parent: (%p):%d %s\n", - dev->bus->dev, dev->bus->link, - dev_path(dev->bus->dev)); - dev->chip = chip; - dev->enabled = chip->path[i].enabled; - dev->links = link + 1; - for(child = chip->children; child; child = child->next) { - if (!child->bus && child->link == i) { - child->bus = &dev->link[link]; - } - } - res = &chip->path[i].resource[0]; - res_limit = &chip->path[i].resource[MAX_RESOURCES]; - for(; res < res_limit; res++) { - if (res->flags) { - struct resource *resource; - resource = new_resource(dev, res->index); - resource->flags = res->flags | IORESOURCE_FIXED | IORESOURCE_ASSIGNED; - resource->base = res->base; - } - } - } - - if (dev && !chip->dev) { - chip->dev = dev; - } - } - if (chip->children && !chip->dev) { - die("No device but children?"); - } - for(child = chip->children; child; child = child->next) { - if (!child->bus) { - child->bus = &chip->dev->link[0]; - } - } -} - -/** - * @brief Enumerate a static device tree. - * - * A static device chain is a linked list of static device structures which are - * on the same branch of the static device tree. This function does not only - * enumerate the devices on a single chain, as its name suggest, it also walks - * into the subordinary chains by recursion. It calls the device specific - * chip_control::enumerate() of the device if one exists or calls the generic - * chip_enumerate(). - * - * This function is only an iterator, the exact definition of 'enumerate' - * depends on the implementation of the generic chip_enumerate() and/or device - * specific chip_control::enumerate(). - * - * @param root static chip structure to start with. - * - * @see chip_control::enumerate() - */ -static void enumerate_static_device_chain(struct chip *root) -{ - struct chip *chip; - for(chip = root; chip; chip = chip->next) { - void (*enumerate)(struct chip *chip); - enumerate = chip_enumerate; - if (chip->control && chip->control->enumerate) { - enumerate = chip->control->enumerate; - } - enumerate(chip); - } - - for(chip = root; chip; chip = chip->next) { - if (chip->children) { - enumerate_static_device_chain(chip->children); - } - } -} - -/** - * @brief Enumerate static devices in the system. - * - * Static device is . Static devices are actually enumerated or "listed" in - * the Config.lb config file and the corresponding data structures are - * generated by config tool in the static.c. - * - * \note The definition of 'enumerate' is not clear in this context. Does it - * mean probe ? - * - * \note How do we determine the existence of the static devices ? Static - * devices are listed in the config file and generated at compile time by config - * tool. This function is called at certain point in the early stage of - * LinuxBIOS. It uses the chip_enumerate() function to convert the static - * structures into dynamic ones. What if the static devices listed in the config - * file does actually not exist in the system ? Is there any side effect of - * these 'phantom' device structures - * - * The static device does not necesarry conform to the dynamic device tree in - * the system. - */ -void enumerate_static_devices(void) -{ - struct chip *child; - int i; - printk_info("Enumerating static devices...\n"); - static_root.dev = &dev_root; - dev_root.links = MAX_LINKS; - for(i = 0; i < MAX_LINKS; i++) { - dev_root.link[i].link = i; - dev_root.link[i].dev = &dev_root; - for(child = static_root.children; child; child = child->next) { - if (!child->bus && child->link == i) { - child->bus = &dev_root.link[i]; - } - } - } - for(child = static_root.children; child; child = child->next) { - if (!child->bus) { - child->bus = &dev_root.link[0]; - } - } - enumerate_static_device_chain(&static_root); -} diff --git a/src/devices/device.c b/src/devices/device.c index 796aafb6ff..a2ded6d17c 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -27,7 +27,7 @@ /** Linked list of ALL devices */ struct device *all_devices = &dev_root; /** Pointer to the last device */ -static struct device **last_dev_p = &dev_root.next; +extern struct device **last_dev_p; /** The upper limit of MEM resource of the devices. * Reserve 20M for the system */ @@ -504,6 +504,9 @@ void dev_enumerate(void) unsigned subordinate; printk_info("Enumerating buses...\n"); root = &dev_root; + if (root->chip_ops && root->chip_ops->enable_dev) { + root->chip_ops->enable_dev(root); + } if (!root->ops || !root->ops->scan_bus) { printk_err("dev_root missing scan_bus operation"); return; diff --git a/src/devices/device_util.c b/src/devices/device_util.c index 7a942b457e..56a96015b8 100644 --- a/src/devices/device_util.c +++ b/src/devices/device_util.c @@ -133,6 +133,14 @@ const char *dev_path(device_t dev) sprintf(buffer, "APIC: %02x", dev->path.u.apic.apic_id); break; + case DEVICE_PATH_PCI_DOMAIN: + sprintf(buffer, "PCI_DOMAIN: %04x", + dev->path.u.pci_domain.domain); + break; + case DEVICE_PATH_APIC_CLUSTER: + sprintf(buffer, "APIC_CLUSTER: %01x", + dev->path.u.apic_cluster.cluster); + break; default: printk_err("Unknown device path type: %d\n", dev->path.type); break; @@ -155,8 +163,7 @@ int path_eq(struct device_path *path1, struct device_path *path2) equal = 1; break; case DEVICE_PATH_PCI: - equal = (path1->u.pci.bus == path2->u.pci.bus) && - (path1->u.pci.devfn == path2->u.pci.devfn); + equal = (path1->u.pci.devfn == path2->u.pci.devfn); break; case DEVICE_PATH_PNP: equal = (path1->u.pnp.port == path2->u.pnp.port) && @@ -168,6 +175,12 @@ int path_eq(struct device_path *path1, struct device_path *path2) case DEVICE_PATH_APIC: equal = (path1->u.apic.apic_id == path2->u.apic.apic_id); break; + case DEVICE_PATH_PCI_DOMAIN: + equal = (path1->u.pci_domain.domain == path2->u.pci_domain.domain); + break; + case DEVICE_PATH_APIC_CLUSTER: + equal = (path1->u.apic_cluster.cluster == path2->u.apic_cluster.cluster); + break; default: printk_err("Uknown device type: %d\n", path1->type); break; diff --git a/src/devices/hypertransport.c b/src/devices/hypertransport.c index 344f23fec4..e8cf432cb1 100644 --- a/src/devices/hypertransport.c +++ b/src/devices/hypertransport.c @@ -5,7 +5,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <part/hard_reset.h> #include <part/fallback_boot.h> @@ -263,8 +262,8 @@ unsigned int hypertransport_scan_chain(struct bus *bus, unsigned int max) /* Add this device to the pci bus chain */ *chain_last = dev; /* Run the magice enable sequence for the device */ - if (dev->chip && dev->chip->control && dev->chip->control->enable_dev) { - dev->chip->control->enable_dev(dev); + if (dev->chip_ops && dev->chip_ops->enable_dev) { + dev->chip_ops->enable_dev(dev); } /* Now read the vendor and device id */ id = pci_read_config32(dev, PCI_VENDOR_ID); diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index 5d72f03ccd..a7b2ff3e89 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -18,7 +18,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <part/hard_reset.h> #include <part/fallback_boot.h> #include <delay.h> @@ -486,7 +485,7 @@ void pci_dev_enable_resources(struct device *dev) /* Set the subsystem vendor and device id for mainboard devices */ ops = ops_pci(dev); - if (dev->chip && ops && ops->set_subsystem) { + if (dev->chip_ops && ops && ops->set_subsystem) { printk_debug("%s subsystem <- %02x/%02x\n", dev_path(dev), MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID, @@ -740,10 +739,9 @@ unsigned int pci_scan_bus(struct bus *bus, * it may be absent and enable_dev must cope. * */ - if ( dev->chip && dev->chip->control && - dev->chip->control->enable_dev) + if (dev->chip_ops && dev->chip_ops->enable_dev) { - dev->chip->control->enable_dev(dev); + dev->chip_ops->enable_dev(dev); } /* Now read the vendor and device id */ id = pci_read_config32(dev, PCI_VENDOR_ID); diff --git a/src/devices/pnp_device.c b/src/devices/pnp_device.c index 9ecfe63a52..70286ad7ac 100644 --- a/src/devices/pnp_device.c +++ b/src/devices/pnp_device.c @@ -185,22 +185,24 @@ static void get_resources(device_t dev, struct pnp_info *info) } } -void pnp_enumerate(struct chip *chip, unsigned functions, - struct device_operations *ops, struct pnp_info *info) +void pnp_enable_devices(device_t base_dev, struct device_operations *ops, + unsigned functions, struct pnp_info *info) { struct device_path path; device_t dev; int i; - chip_enumerate(chip); - path.type = DEVICE_PATH_PNP; - path.u.pnp.port = chip->dev->path.u.pnp.port; + path.u.pnp.port = base_dev->path.u.pnp.port; /* Setup the ops and resources on the newly allocated devices */ for(i = 0; i < functions; i++) { path.u.pnp.device = info[i].function; - dev = alloc_find_dev(chip->bus, &path); + dev = alloc_find_dev(base_dev->bus, &path); + + /* Don't initialize a device multiple times */ + if (dev->ops) + continue; if (info[i].ops == 0) { dev->ops = ops; diff --git a/src/devices/root_device.c b/src/devices/root_device.c index 1642e8beda..8e85212506 100644 --- a/src/devices/root_device.c +++ b/src/devices/root_device.c @@ -76,6 +76,9 @@ unsigned int scan_static_bus(device_t bus, unsigned int max) for(link = 0; link < bus->links; link++) { for(child = bus->link[link].children; child; child = child->sibling) { + if (child->chip_ops && child->chip_ops->enable_dev) { + child->chip_ops->enable_dev(child); + } if (child->ops && child->ops->enable) { child->ops->enable(child); } @@ -142,7 +145,6 @@ unsigned int root_dev_scan_bus(device_t root, unsigned int max) void root_dev_init(device_t root) { - initialize_cpus(root); } /** @@ -169,9 +171,4 @@ struct device_operations default_dev_ops_root = { * This is the root of the dynamic device tree. A PCI tree always has * one bus, bus 0. Bus 0 contains devices and bridges. */ -struct device dev_root = { - .ops = &default_dev_ops_root, - .bus = &dev_root.link[0], - .path = { .type = DEVICE_PATH_ROOT }, - .enabled = 1, -}; +extern struct device dev_root; diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 85603750b5..e211d990e0 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -5,7 +5,7 @@ struct device; #include <arch/cpu.h> void cpu_initialize(void); -void initialize_cpus(struct device *root); +void initialize_cpus(struct bus *cpu_bus); #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) /** start of compile time generated pci driver array */ diff --git a/src/include/device/chip.h b/src/include/device/chip.h deleted file mode 100644 index 5f4e36b87c..0000000000 --- a/src/include/device/chip.h +++ /dev/null @@ -1,85 +0,0 @@ -#ifndef DEVICE_CHIP_H -#define DEVICE_CHIP_H - -#include <device/path.h> -#include <device/device.h> - -/* chips are arbitrary chips (superio, southbridge, etc.) - * They have private structures that define chip resources and default - * settings. They have four externally visible functions for control. - * They have a generic component which applies to all chips for - * path, etc. - */ - -/* some of the types of resources chips can control */ -#if CONFIG_CHIP_CONFIGURE == 1 -#define CONFIGURE(pass) chip_configure(&static_root, pass) -#else -#define CONFIGURE(pass) -#endif - -enum chip_pass { - CONF_PASS_PRE_CONSOLE, - CONF_PASS_PRE_PCI, - CONF_PASS_PRE_DEVICE_ENUMERATE, - CONF_PASS_PRE_DEVICE_CONFIGURE, - CONF_PASS_PRE_DEVICE_ENABLE, - CONF_PASS_PRE_DEVICE_INITIALIZE, - CONF_PASS_POST_PCI, - CONF_PASS_PRE_BOOT -}; - - -/* linkages from devices of a type (e.g. superio devices) - * to the actual physical PCI device. This type is used in an array of - * structs built by NLBConfig.py. We owe this idea to Plan 9. - */ - -struct chip; -struct device; - -/* there is one of these for each TYPE of chip */ -struct chip_control { - /* This is the print name for debugging */ - char *name; - void (*enable)(struct chip *, enum chip_pass); - void (*enumerate)(struct chip *chip); - void (*enable_dev)(struct device *dev); -}; - -struct chip_resource { - unsigned long flags; - unsigned long index; - unsigned long base; -}; - -struct chip_device_path { - struct device_path path; - unsigned channel; - int enabled; - struct chip_resource resource[MAX_RESOURCES]; -}; - -struct device; -struct bus; - -#ifndef MAX_CHIP_PATHS -#define MAX_CHIP_PATHS 16 -#endif -struct chip { - unsigned link; - struct chip_control *control; /* for this device */ - struct chip_device_path path[MAX_CHIP_PATHS]; /* can be 0, in which case the default is taken */ - char *configuration; /* can be 0. */ - struct chip *next, *children; - /* there is one of these for each INSTANCE of a chip */ - void *chip_info; /* the dreaded "void *" */ - /* bus and device links into the device tree */ - struct bus *bus; - struct device *dev; -}; - -extern struct chip static_root; -extern void chip_configure(struct chip *, enum chip_pass); -extern void chip_enumerate(struct chip *chip); -#endif /* DEVICE_CHIP_H */ diff --git a/src/include/device/device.h b/src/include/device/device.h index c5a18c298e..d5d2e8d946 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -5,11 +5,18 @@ #include <device/resource.h> #include <device/path.h> + struct device; typedef struct device * device_t; struct pci_operations; struct smbus_bus_operations; +/* Chip operations */ +struct chip_operations { + char *name; /* This is the print name for debugging */ + void (*enable_dev)(struct device *dev); +}; + struct device_operations { void (*read_resources)(device_t dev); void (*set_resources)(device_t dev); @@ -67,7 +74,7 @@ struct device { unsigned long rom_address; struct device_operations *ops; - struct chip_control *chip_control; + struct chip_operations *chip_ops; void *chip_info; }; diff --git a/src/include/device/path.h b/src/include/device/path.h index 9df1d9fa67..cdb98ee8a8 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -10,7 +10,7 @@ enum device_path_type { DEVICE_PATH_I2C, DEVICE_PATH_APIC, DEVICE_PATH_PCI_DOMAIN, - DEVICE_APIC_CLUSTER, + DEVICE_PATH_APIC_CLUSTER, }; struct pci_domain_path diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index 89c0a730f5..757b240c32 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -4,7 +4,6 @@ #include <stdint.h> #include <device/device.h> #include <device/pnp_def.h> -#include <device/chip.h> /* Primitive pnp resource manipulation */ void pnp_write_config(device_t dev, uint8_t reg, uint8_t value); @@ -45,7 +44,7 @@ struct pnp_info { struct io_info io0, io1, io2, io3; }; struct resource *pnp_get_resource(device_t dev, unsigned index); -void pnp_enumerate(struct chip *chip, unsigned functions, - struct device_operations *ops, struct pnp_info *info); +void pnp_enable_devices(struct device *dev, struct device_operations *ops, + unsigned functions, struct pnp_info *info); #endif /* DEVICE_PNP_H */ diff --git a/src/include/device/smbus.h b/src/include/device/smbus.h index 230f061900..40e49eefae 100644 --- a/src/include/device/smbus.h +++ b/src/include/device/smbus.h @@ -4,7 +4,6 @@ #include <stdint.h> #include <device/device.h> #include <device/path.h> -#include <device/chip.h> #include <device/smbus_def.h> /* Common smbus bus operations */ diff --git a/src/lib/version.c b/src/lib/version.c index 73d52ca843..028e0062b2 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -1,8 +1,5 @@ #include <version.h> -#define __STR(X) #X -#define STR(X) __STR(X) - #ifndef MAINBOARD_VENDOR #error MAINBOARD_VENDOR not defined #endif @@ -39,23 +36,23 @@ #ifndef LINUXBIOS_EXTRA_VERSION -#define LINUXBIOS_EXTRA_VERSION +#define LINUXBIOS_EXTRA_VERSION "" #endif -const char mainboard_vendor[] = STR(MAINBOARD_VENDOR); -const char mainboard_part_number[] = STR(MAINBOARD_PART_NUMBER); +const char mainboard_vendor[] = MAINBOARD_VENDOR; +const char mainboard_part_number[] = MAINBOARD_PART_NUMBER; -const char linuxbios_version[] = STR(LINUXBIOS_VERSION); -const char linuxbios_extra_version[] = STR(LINUXBIOS_EXTRA_VERSION); -const char linuxbios_build[] = STR(LINUXBIOS_BUILD); +const char linuxbios_version[] = LINUXBIOS_VERSION; +const char linuxbios_extra_version[] = LINUXBIOS_EXTRA_VERSION; +const char linuxbios_build[] = LINUXBIOS_BUILD; -const char linuxbios_compile_time[] = STR(LINUXBIOS_COMPILE_TIME); -const char linuxbios_compile_by[] = STR(LINUXBIOS_COMPILE_BY); -const char linuxbios_compile_host[] = STR(LINUXBIOS_COMPILE_HOST); -const char linuxbios_compile_domain[] = STR(LINUXBIOS_COMPILE_DOMAIN); -const char linuxbios_compiler[] = STR(LINUXBIOS_COMPILER); -const char linuxbios_linker[] = STR(LINUXBIOS_LINKER); -const char linuxbios_assembler[] = STR(LINUXBIOS_ASSEMBLER); +const char linuxbios_compile_time[] = LINUXBIOS_COMPILE_TIME; +const char linuxbios_compile_by[] = LINUXBIOS_COMPILE_BY; +const char linuxbios_compile_host[] = LINUXBIOS_COMPILE_HOST; +const char linuxbios_compile_domain[] = LINUXBIOS_COMPILE_DOMAIN; +const char linuxbios_compiler[] = LINUXBIOS_COMPILER; +const char linuxbios_linker[] = LINUXBIOS_LINKER; +const char linuxbios_assembler[] = LINUXBIOS_ASSEMBLER; diff --git a/src/mainboard/Iwill/DK8S2/mainboard.c b/src/mainboard/Iwill/DK8S2/mainboard.c index 48ea1ac88b..0f609b3f69 100644 --- a/src/mainboard/Iwill/DK8S2/mainboard.c +++ b/src/mainboard/Iwill/DK8S2/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/Iwill/DK8X/mainboard.c b/src/mainboard/Iwill/DK8X/mainboard.c index 82041282f6..6153ce08aa 100644 --- a/src/mainboard/Iwill/DK8X/mainboard.c +++ b/src/mainboard/Iwill/DK8X/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c index 917a2ac792..cf5b475e95 100644 --- a/src/mainboard/amd/quartet/mainboard.c +++ b/src/mainboard/amd/quartet/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/amd/serenade/mainboard.c b/src/mainboard/amd/serenade/mainboard.c index 27146e79b0..cce62a28e8 100644 --- a/src/mainboard/amd/serenade/mainboard.c +++ b/src/mainboard/amd/serenade/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c index 2c3ccc94eb..75e66c1d03 100644 --- a/src/mainboard/amd/solo/mainboard.c +++ b/src/mainboard/amd/solo/mainboard.c @@ -6,7 +6,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb index 1406a48b86..5bb0bc3485 100644 --- a/src/mainboard/arima/hdama/Options.lb +++ b/src/mainboard/arima/hdama/Options.lb @@ -34,16 +34,32 @@ uses MAINBOARD_VENDOR uses MAINBOARD uses LINUXBIOS_EXTRA_VERSION uses _RAMBASE +uses CC +uses HOSTCC +uses TTYS0_BAUD +uses TTYS0_BASE +uses TTYS0_LCS +uses DEFAULT_CONSOLE_LOGLEVEL +uses MAXIMUM_CONSOLE_LOGLEVEL +uses MAINBOARD_POWER_ON_AFTER_POWER_FAIL +uses CONFIG_CONSOLE_SERIAL8250 -## ROM_SIZE is the size of boot ROM that this board will use. -default ROM_SIZE=524288 - ### ### Build options ### ## +## ROM_SIZE is the size of boot ROM that this board will use. +## +default ROM_SIZE=524288 + +## +## FALLBACK_SIZE is the amount of the ROM the complete fallback image will use +## +default FALLBACK_SIZE=131072 + +## ## Build code for the fallback boot ## default HAVE_FALLBACK_BOOT=1 @@ -123,6 +139,10 @@ default HEAP_SIZE=0x4000 ## Only use the option table in a normal image ## default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE + +## +## LinuxBIOS C code runs at this location in RAM +## default _RAMBASE=0x00004000 ## @@ -130,5 +150,61 @@ default _RAMBASE=0x00004000 ## default CONFIG_ROM_STREAM = 1 +### +### Defaults of options that you may want to override in the target config file +### + +## +## The default compiler +## +default CC="gcc" +default HOSTCC="gcc" + +## +## The Serial Console +## + +# To Enable the Serial Console +default CONFIG_CONSOLE_SERIAL8250=1 + +## Select the serial console baud rate +default TTYS0_BAUD=115200 +#default TTYS0_BAUD=57600 +#default TTYS0_BAUD=38400 +#default TTYS0_BAUD=19200 +#default TTYS0_BAUD=9600 +#default TTYS0_BAUD=4800 +#default TTYS0_BAUD=2400 +#default TTYS0_BAUD=1200 + +# Select the serial console base port +default TTYS0_BASE=0x3f8 + +# Select the serial protocol +# This defaults to 8 data bits, 1 stop bit, and no parity +default TTYS0_LCS=0x3 + +## +### Select the linuxBIOS loglevel +## +## EMERG 1 system is unusable +## ALERT 2 action must be taken immediately +## CRIT 3 critical conditions +## ERR 4 error conditions +## WARNING 5 warning conditions +## NOTICE 6 normal but significant condition +## INFO 7 informational +## DEBUG 8 debug-level messages +## SPEW 9 Way too many details + +## Request this level of debugging output +default DEFAULT_CONSOLE_LOGLEVEL=8 +## At a maximum only compile in this level of debugging +default MAXIMUM_CONSOLE_LOGLEVEL=8 + +## +## Select power on after power fail setting +default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON" +### End Options.lb end diff --git a/src/mainboard/arima/hdama/chip.h b/src/mainboard/arima/hdama/chip.h index ba52d6dbdb..c3792f41e9 100644 --- a/src/mainboard/arima/hdama/chip.h +++ b/src/mainboard/arima/hdama/chip.h @@ -1,4 +1,4 @@ -extern struct chip_control mainboard_arima_hdama_control; +extern struct chip_operations mainboard_arima_hdama_ops; struct mainboard_arima_hdama_config { int nothing; diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c index 81f82b3d75..78b8715640 100644 --- a/src/mainboard/arima/hdama/mainboard.c +++ b/src/mainboard/arima/hdama/mainboard.c @@ -9,7 +9,6 @@ #include <delay.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "../../../northbridge/amd/amdk8/cpu_rev.c" #include "chip.h" @@ -312,13 +311,12 @@ static struct device_operations mainboard_operations = { .enable = 0, }; -static void enumerate(struct chip *chip) +static void enable_dev(struct chip *chip) { dev_root.ops = &mainboard_operations; - chip_enumerate(chip); } -struct chip_control mainboard_arima_hdama_control = { - .enumerate = enumerate, +struct chip_operations mainboard_arima_hdama_ops = { .name = "Arima HDAMA mainboard ", + .enable_dev = enable_dev, }; diff --git a/src/mainboard/densitron/dpx114/mainboard.c b/src/mainboard/densitron/dpx114/mainboard.c index df52081ac7..5abb8fcec2 100644 --- a/src/mainboard/densitron/dpx114/mainboard.c +++ b/src/mainboard/densitron/dpx114/mainboard.c @@ -1,4 +1,3 @@ - #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -6,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "chip.h" static int diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c index 137c49a0ff..aa7428300b 100644 --- a/src/mainboard/digitallogic/adl855pc/mainboard.c +++ b/src/mainboard/digitallogic/adl855pc/mainboard.c @@ -1,4 +1,3 @@ - #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -6,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "chip.h" static int diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-i386/mainboard.c index 270e5df9eb..4e5c84c4bc 100644 --- a/src/mainboard/emulation/qemu-i386/mainboard.c +++ b/src/mainboard/emulation/qemu-i386/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "chip.h" void cpufixup(unsigned long mem) diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c index 01969d6448..83f44ec623 100644 --- a/src/mainboard/ibm/e325/mainboard.c +++ b/src/mainboard/ibm/e325/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c index 5e58ebcd18..d170f48eb3 100644 --- a/src/mainboard/newisys/khepri/mainboard.c +++ b/src/mainboard/newisys/khepri/mainboard.c @@ -5,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c index ca05fa0861..88cf9861c4 100644 --- a/src/mainboard/technologic/ts5300/mainboard.c +++ b/src/mainboard/technologic/ts5300/mainboard.c @@ -1,4 +1,3 @@ - #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -6,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "chip.h" static int diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c index 143909f1a5..c53681d9e6 100644 --- a/src/mainboard/tyan/s2735/mainboard.c +++ b/src/mainboard/tyan/s2735/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c index 6864a0333d..87cb2908e7 100644 --- a/src/mainboard/tyan/s2850/mainboard.c +++ b/src/mainboard/tyan/s2850/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c index bb1eba3b9b..8a7c3d0fff 100644 --- a/src/mainboard/tyan/s2875/mainboard.c +++ b/src/mainboard/tyan/s2875/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c index 17ceb5d916..d15ae19997 100644 --- a/src/mainboard/tyan/s2880/mainboard.c +++ b/src/mainboard/tyan/s2880/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c index 86158b7551..231f33777c 100644 --- a/src/mainboard/tyan/s2881/mainboard.c +++ b/src/mainboard/tyan/s2881/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c index 0f440856af..914d302422 100644 --- a/src/mainboard/tyan/s2882/mainboard.c +++ b/src/mainboard/tyan/s2882/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c index 2c01584310..f29f486896 100644 --- a/src/mainboard/tyan/s2885/mainboard.c +++ b/src/mainboard/tyan/s2885/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c index 2ed9eb9c2f..cf2b3bcf21 100644 --- a/src/mainboard/tyan/s4880/mainboard.c +++ b/src/mainboard/tyan/s4880/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c index 32e1a31fd2..dcabd840e2 100644 --- a/src/mainboard/tyan/s4882/mainboard.c +++ b/src/mainboard/tyan/s4882/mainboard.c @@ -1,6 +1,5 @@ #include <console/console.h> #include <device/device.h> -#include <device/chip.h> #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c index 9597392593..443a7cbf3d 100644 --- a/src/mainboard/via/epia-m/mainboard.c +++ b/src/mainboard/via/epia-m/mainboard.c @@ -1,4 +1,3 @@ - #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -6,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "chip.h" void vga_enable_console(); diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c index df52081ac7..5abb8fcec2 100644 --- a/src/mainboard/via/epia/mainboard.c +++ b/src/mainboard/via/epia/mainboard.c @@ -1,4 +1,3 @@ - #include <console/console.h> #include <device/device.h> #include <device/pci.h> @@ -6,7 +5,6 @@ #include <device/pci_ops.h> #include <arch/io.h> -#include <device/chip.h> #include "chip.h" static int diff --git a/src/northbridge/amd/amdk8/chip.h b/src/northbridge/amd/amdk8/chip.h index a6111c98c9..26d4e53ac6 100644 --- a/src/northbridge/amd/amdk8/chip.h +++ b/src/northbridge/amd/amdk8/chip.h @@ -2,4 +2,4 @@ struct northbridge_amd_amdk8_config { }; -extern struct chip_control northbridge_amd_amdk8_control; +extern struct chip_operations northbridge_amd_amdk8_ops; diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index 4933b161b7..cb2f9fa0a7 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -6,10 +6,10 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> +#include <cpu/cpu.h> #include "chip.h" #include "northbridge.h" #include "amdk8.h" @@ -487,7 +487,7 @@ static struct pci_driver mcf0_driver __pci_driver = { #define BRIDGE_IO_MASK (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH) -static void bridge_read_resources(device_t dev) +static void pci_domain_read_resources(device_t dev) { struct resource *resource; unsigned reg; @@ -556,7 +556,7 @@ static void ram_resource(device_t dev, unsigned long index, IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; } -static void bridge_set_resources(device_t dev) +static void pci_domain_set_resources(device_t dev) { struct resource *io, *mem1, *mem2; struct resource *resource, *last; @@ -577,7 +577,7 @@ static void bridge_set_resources(device_t dev) mem2 = find_resource(dev, 2); /* See if both resources have roughly the same limits */ if (((mem1->limit <= 0xffffffff) && (mem2->limit <= 0xffffffff)) || - (mem1->limit > 0xffffffff) && (mem2->limit > 0xffffffff)) + ((mem1->limit > 0xffffffff) && (mem2->limit > 0xffffffff))) { /* If so place the one with the most stringent alignment first */ @@ -682,21 +682,34 @@ static void bridge_set_resources(device_t dev) assign_resources(&dev->link[0]); } - - -static unsigned int bridge_scan_bus(device_t root, unsigned int max) +static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max) { - struct bus *cpu_bus; unsigned reg; int i; /* Unmap all of the HT chains */ for(reg = 0xe0; reg <= 0xec; reg += 4) { f1_write_config32(reg, 0); } - max = pci_scan_bus(&root->link[0], PCI_DEVFN(0x18, 0), 0xff, max); + max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0x18, 0), 0xff, max); + return max; +} + +static struct device_operations pci_domain_ops = { + .read_resources = pci_domain_read_resources, + .set_resources = pci_domain_set_resources, + .enable_resources = enable_childrens_resources, + .init = 0, + .scan_bus = pci_domain_scan_bus, +}; + +static unsigned int scan_cpu_bus(device_t dev, unsigned int max) +{ + struct bus *cpu_bus; + unsigned reg; + int i; /* Find which cpus are present */ - cpu_bus = &dev_root.link[1]; + cpu_bus = &dev->link[0]; for(i = 0; i < 7; i++) { device_t dev, cpu; struct device_path cpu_path; @@ -732,40 +745,39 @@ static unsigned int bridge_scan_bus(device_t root, unsigned int max) dev_path(cpu), cpu->enabled?"enabled":"disabled"); } } - return max; } +static void cpu_bus_init(device_t dev) +{ + printk_debug("cpu_bus_init\n"); +#if 0 + initialize_cpus(&dev->link[0]); +#endif +} -static struct device_operations bridge_ops = { - .read_resources = bridge_read_resources, - .set_resources = bridge_set_resources, - .enable_resources = enable_childrens_resources, - .init = 0, - .scan_bus = bridge_scan_bus, +static struct device_operations cpu_bus_ops = { + .read_resources = 0, + .set_resources = 0, + .enable_resources = 0, + .init = cpu_bus_init, + .scan_bus = scan_cpu_bus, }; -static void enumerate(struct chip *chip) +static void enable_dev(struct device *dev) { struct device_path path; - device_t bridge; - chip_enumerate(chip); - /* Get the path for the bridge device */ - path.type = DEVICE_PATH_PNP; - path.u.pnp.port = 0xcf8; - path.u.pnp.device = 0; - - /* Lookup the bridge device */ - bridge = find_dev_path(&dev_root.link[0], &path); - - /* Set the bridge operations */ - if (bridge) { - bridge->ops = &bridge_ops; + /* Set the operations if it is a special bus type */ + if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { + dev->ops = &pci_domain_ops; + } + else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + dev->ops = &cpu_bus_ops; } } -struct chip_control northbridge_amd_amdk8_control = { - .name = "AMD K8 Northbridge", - .enumerate = enumerate, +struct chip_operations northbridge_amd_amdk8_ops = { + .name = "AMD K8 Northbridge", + .enable_dev = enable_dev, }; diff --git a/src/northbridge/emulation/qemu-i386/northbridge.c b/src/northbridge/emulation/qemu-i386/northbridge.c index 9a8f557302..78ec64e310 100644 --- a/src/northbridge/emulation/qemu-i386/northbridge.c +++ b/src/northbridge/emulation/qemu-i386/northbridge.c @@ -6,7 +6,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/intel/855pm/northbridge.c b/src/northbridge/intel/855pm/northbridge.c index d4f73df3d2..906617ad8e 100644 --- a/src/northbridge/intel/855pm/northbridge.c +++ b/src/northbridge/intel/855pm/northbridge.c @@ -5,7 +5,6 @@ #include <part/sizeram.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c index 452166ba28..79068310c8 100644 --- a/src/northbridge/intel/e7501/northbridge.c +++ b/src/northbridge/intel/e7501/northbridge.c @@ -5,7 +5,6 @@ #include <part/sizeram.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/intel/i855pm/northbridge.c b/src/northbridge/intel/i855pm/northbridge.c index eb03266ae1..f980c5436a 100644 --- a/src/northbridge/intel/i855pm/northbridge.c +++ b/src/northbridge/intel/i855pm/northbridge.c @@ -5,7 +5,6 @@ #include <part/sizeram.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/transmeta/tm5800/northbridge.c b/src/northbridge/transmeta/tm5800/northbridge.c index ccce795da4..af101eb64b 100644 --- a/src/northbridge/transmeta/tm5800/northbridge.c +++ b/src/northbridge/transmeta/tm5800/northbridge.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c index 5f5e5d9dd8..16a7ea8530 100644 --- a/src/northbridge/via/vt8601/northbridge.c +++ b/src/northbridge/via/vt8601/northbridge.c @@ -6,7 +6,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c index cba7278066..c026197973 100644 --- a/src/northbridge/via/vt8623/northbridge.c +++ b/src/northbridge/via/vt8623/northbridge.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/hypertransport.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/southbridge/amd/amd8111/Config.lb b/src/southbridge/amd/amd8111/Config.lb index 2a55714eec..8575c2b1eb 100644 --- a/src/southbridge/amd/amd8111/Config.lb +++ b/src/southbridge/amd/amd8111/Config.lb @@ -1,4 +1,4 @@ -config amd8111.h +config chip.h driver amd8111.o #driver amd8111_usb.o driver amd8111_lpc.o diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c index 2c5d1e80fe..afb02f1fec 100644 --- a/src/southbridge/amd/amd8111/amd8111.c +++ b/src/southbridge/amd/amd8111/amd8111.c @@ -2,7 +2,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/chip.h> #include "amd8111.h" void amd8111_enable(device_t dev) @@ -62,7 +61,7 @@ void amd8111_enable(device_t dev) } -struct chip_control southbridge_amd_amd8111_control = { +struct chip_operations southbridge_amd_amd8111_ops = { .name = "AMD 8111 Southbridge", .enable_dev = amd8111_enable, }; diff --git a/src/southbridge/amd/amd8111/amd8111.h b/src/southbridge/amd/amd8111/amd8111.h index 10e152954f..da4fa1d840 100644 --- a/src/southbridge/amd/amd8111/amd8111.h +++ b/src/southbridge/amd/amd8111/amd8111.h @@ -1,11 +1,7 @@ #ifndef AMD8111_H #define AMD8111_H -struct southbridge_amd_amd8111_config -{ -}; -struct chip_control; -extern struct chip_control southbridge_amd_amd8111_control; +#include "chip.h" void amd8111_enable(device_t dev); diff --git a/src/southbridge/amd/amd8111/amd8111_lpc.c b/src/southbridge/amd/amd8111/amd8111_lpc.c index 9c5b5a674e..ff767c7cc4 100644 --- a/src/southbridge/amd/amd8111/amd8111_lpc.c +++ b/src/southbridge/amd/amd8111/amd8111_lpc.c @@ -6,7 +6,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <device/chip.h> #include <pc80/mc146818rtc.h> #include "amd8111.h" diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.c b/src/southbridge/intel/i82801dbm/i82801dbm.c index 328d0eec07..281836b099 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm.c @@ -2,7 +2,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/chip.h> #include "i82801dbm.h" void i82801dbm_enable(device_t dev) diff --git a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c index 1f43ff7532..2d272db6d8 100644 --- a/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c +++ b/src/southbridge/intel/i82801dbm/i82801dbm_lpc.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <device/chip.h> #include <pc80/mc146818rtc.h> #include "i82801dbm.h" diff --git a/src/southbridge/intel/i82801er/i82801er.c b/src/southbridge/intel/i82801er/i82801er.c index 565d672260..0e4e3b3a56 100644 --- a/src/southbridge/intel/i82801er/i82801er.c +++ b/src/southbridge/intel/i82801er/i82801er.c @@ -2,7 +2,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/chip.h> #include "i82801er.h" void i82801er_enable(device_t dev) diff --git a/src/southbridge/intel/i82801er/i82801er_lpc.c b/src/southbridge/intel/i82801er/i82801er_lpc.c index c1ee7410ed..7a449421b0 100644 --- a/src/southbridge/intel/i82801er/i82801er_lpc.c +++ b/src/southbridge/intel/i82801er/i82801er_lpc.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> -#include <device/chip.h> #include <pc80/mc146818rtc.h> #include "i82801er.h" diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c index c6cb55cba3..1eed3681c7 100644 --- a/src/southbridge/ricoh/rl5c476/rl5c476.c +++ b/src/southbridge/ricoh/rl5c476/rl5c476.c @@ -25,7 +25,6 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <console/console.h> #include "rl5c476.h" #include "chip.h" diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c index 89445d6a2a..99fef4c0cc 100644 --- a/src/southbridge/via/vt8231/vt8231.c +++ b/src/southbridge/via/vt8231/vt8231.c @@ -4,7 +4,6 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <console/console.h> #include "vt8231.h" #include "chip.h" diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c index fc4c6a6186..a8dc4bae6e 100644 --- a/src/southbridge/via/vt8235/vt8235.c +++ b/src/southbridge/via/vt8235/vt8235.c @@ -4,7 +4,6 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <console/console.h> #include "vt8235.h" #include "chip.h" diff --git a/src/southbridge/winbond/w83c553/w83c553f.c b/src/southbridge/winbond/w83c553/w83c553f.c index 054fc25d32..bd0b569b54 100644 --- a/src/southbridge/winbond/w83c553/w83c553f.c +++ b/src/southbridge/winbond/w83c553/w83c553f.c @@ -34,7 +34,6 @@ #include <arch/io.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <console/console.h> #include "w83c553f.h" diff --git a/src/superio/NSC/pc87360/chip.h b/src/superio/NSC/pc87360/chip.h index 9e0ef6f976..0a9846b137 100644 --- a/src/superio/NSC/pc87360/chip.h +++ b/src/superio/NSC/pc87360/chip.h @@ -5,7 +5,8 @@ #define SIO_COM2_BASE 0x2F8 #endif -extern struct chip_control superio_NSC_pc87360_control; +struct chip_operations; +extern struct chip_operations superio_NSC_pc87360_ops; #include <pc80/keyboard.h> #include <uart8250.h> diff --git a/src/superio/NSC/pc87360/superio.c b/src/superio/NSC/pc87360/superio.c index c2c33765eb..69eeb31e09 100644 --- a/src/superio/NSC/pc87360/superio.c +++ b/src/superio/NSC/pc87360/superio.c @@ -5,7 +5,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> @@ -24,7 +23,7 @@ static void init(device_t dev) if (!dev->enabled) { return; } - conf = dev->chip->chip_info; + conf = dev->chip_info; switch(dev->path.u.pnp.device) { case PC87360_SP1: res0 = find_resource(dev, PNP_IDX_IO0); @@ -65,13 +64,13 @@ static struct pnp_info pnp_dev_info[] = { }; -static void enumerate(struct chip *chip) +static void enable_dev(struct device *dev) { - pnp_enumerate(chip, sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), - &pnp_ops, pnp_dev_info); + pnp_enable_devices(dev, &pnp_ops, + sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); } -struct chip_control superio_NSC_pc87360_control = { - .enumerate = enumerate, - .name = "NSC 87360" +struct chip_operations superio_NSC_pc87360_ops = { + .name = "NSC 87360", + .enable_dev = enable_dev, }; diff --git a/src/superio/NSC/pc87366/superio.c b/src/superio/NSC/pc87366/superio.c index 7c492583f3..0d1f878ec8 100644 --- a/src/superio/NSC/pc87366/superio.c +++ b/src/superio/NSC/pc87366/superio.c @@ -5,7 +5,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> diff --git a/src/superio/NSC/pc97307/superio.c b/src/superio/NSC/pc97307/superio.c index 124dd5c89c..2fb62e1c93 100644 --- a/src/superio/NSC/pc97307/superio.c +++ b/src/superio/NSC/pc97307/superio.c @@ -2,7 +2,6 @@ /* This code is distributed without warranty under the GPL v2 (see COPYING) */ #include <arch/io.h> -#include <device/chip.h> #include <console/console.h> #include "chip.h" diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c index 26d9356a61..923a098317 100644 --- a/src/superio/via/vt1211/vt1211.c +++ b/src/superio/via/vt1211/vt1211.c @@ -26,7 +26,6 @@ #include <device/pci.h> #include <device/pci_ops.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <console/console.h> #include "vt1211.h" #include "chip.h" diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c index ee0a6872e3..c70c4ea8ba 100644 --- a/src/superio/winbond/w83627hf/superio.c +++ b/src/superio/winbond/w83627hf/superio.c @@ -7,7 +7,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> diff --git a/src/superio/winbond/w83627thf/superio.c b/src/superio/winbond/w83627thf/superio.c index 1d057137fb..db0b308ec1 100644 --- a/src/superio/winbond/w83627thf/superio.c +++ b/src/superio/winbond/w83627thf/superio.c @@ -7,7 +7,6 @@ #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> -#include <device/chip.h> #include <console/console.h> #include <string.h> #include <bitops.h> |