Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mods to device stuff. Rename passes to phases so that people can

Browse source 
figure out what happens in what order. General cleanup. Kill device_t.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@77 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-02-22 21:42:32 +00:00
parent 0850d0cad8
commit d58a95061e
2 changed files with 187 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

238
devices/device.c
View file

@ -31,19 +31,19 @@
*/ */
#include <console/console.h> #include <console/console.h>
#include <bitops.h> //#include <bitops.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <smp/spinlock.h> //#include <smp/spinlock.h>
/** Linked list of ALL devices */ /** Linked list of ALL devices */
struct device *all_devices = &dev_root; struct device *all_devices = &dev_root;
/** Pointer to the last device */ /** Pointer to the last device -- computed at run time -- no more config tool magic */
extern struct device **last_dev_p; struct device **last_dev_p;
/** The upper limit of MEM resource of the devices. /** The upper limit of MEM resource of the devices.
* Reserve 20M for the system */ * Reserve 20M for the system */
@ -52,6 +52,24 @@ extern struct device **last_dev_p;
* Reserve 4k for ISA/Legacy devices */ * Reserve 4k for ISA/Legacy devices */
#define DEVICE_IO_START 0x1000 #define DEVICE_IO_START 0x1000
/**
* @brief Initialization tasks for the device tree code.
*
* At present, merely sets up last_dev_p, which used to be done by Fucking Magic (FM) in config tool
* @return none
*
*/
void
dev_init(void)
{
struct device *dev;
for(dev = all_devices; dev; dev = dev->next) {
last_dev_p = &dev->next;
}
}
/** /**
* @brief Allocate a new device structure. * @brief Allocate a new device structure.
* *
@ -65,13 +83,13 @@ extern struct device **last_dev_p;
* *
* @see device_path * @see device_path
*/ */
static spinlock_t dev_lock = SPIN_LOCK_UNLOCKED; //static spinlock_t dev_lock = SPIN_LOCK_UNLOCKED;
device_t alloc_dev(struct bus *parent, struct device_path *path) struct device * alloc_dev(struct bus *parent, struct device_path *path)
{ {
device_t dev, child; struct device * dev, *child;
int link; int link;
spin_lock(&dev_lock); // spin_lock(&dev_lock);
/* Find the last child of our parent */ /* Find the last child of our parent */
for(child = parent->children; child && child->sibling; ) { for(child = parent->children; child && child->sibling; ) {
@ -108,7 +126,7 @@ device_t alloc_dev(struct bus *parent, struct device_path *path)
*last_dev_p = dev; *last_dev_p = dev;
last_dev_p = &dev->next; last_dev_p = &dev->next;
spin_unlock(&dev_lock); // spin_unlock(&dev_lock);
return dev; return dev;
} }
@ -134,7 +152,7 @@ static void read_resources(struct bus *bus)
{ {
struct device *curdev; struct device *curdev;
printk_spew("%s read_resources bus %d link: %d\n", printk(BIOS_SPEW, "%s read_resources bus %d link: %d\n",
dev_path(bus->dev), bus->secondary, bus->link); dev_path(bus->dev), bus->secondary, bus->link);
/* Walk through all of the devices and find which resources they need. */ /* Walk through all of the devices and find which resources they need. */
@ -147,12 +165,12 @@ static void read_resources(struct bus *bus)
if (!curdev->enabled) { if (!curdev->enabled) {
continue; continue;
} }
if (!curdev->ops || !curdev->ops->read_resources) { if (!curdev->ops || !curdev->ops->phase4_read_resources) {
printk_err("%s missing read_resources\n", printk(BIOS_ERR, "%s missing phase4_read_resources\n",
dev_path(curdev)); dev_path(curdev));
continue; continue;
} }
curdev->ops->read_resources(curdev); curdev->ops->phase4_read_resources(curdev);
curdev->have_resources = 1; curdev->have_resources = 1;
/* Read in subtractive resources behind the current device */ /* Read in subtractive resources behind the current device */
links = 0; links = 0;
@ -164,7 +182,7 @@ static void read_resources(struct bus *bus)
continue; continue;
link = IOINDEX_SUBTRACTIVE_LINK(resource->index); link = IOINDEX_SUBTRACTIVE_LINK(resource->index);
if (link > MAX_LINKS) { if (link > MAX_LINKS) {
printk_err("%s subtractive index on link: %d\n", printk(BIOS_ERR, "%s subtractive index on link: %d\n",
dev_path(curdev), link); dev_path(curdev), link);
continue; continue;
} }
@ -174,7 +192,7 @@ static void read_resources(struct bus *bus)
} }
} }
} }
printk_spew("%s read_resources bus %d link: %d done\n", printk(BIOS_SPEW, "%s read_resources bus %d link: %d done\n",
dev_path(bus->dev), bus->secondary, bus->link); dev_path(bus->dev), bus->secondary, bus->link);
} }
@ -274,7 +292,7 @@ void compute_allocate_resource(
min_align = 0; min_align = 0;
base = bridge->base; base = bridge->base;
printk_spew("%s compute_allocate_%s: base: %08Lx size: %08Lx align: %d gran: %d\n", printk(BIOS_SPEW, "%s compute_allocate_%s: base: %08Lx size: %08Lx align: %d gran: %d\n",
dev_path(bus->dev), dev_path(bus->dev),
(bridge->flags & IORESOURCE_IO)? "io": (bridge->flags & IORESOURCE_IO)? "io":
(bridge->flags & IORESOURCE_PREFETCH)? "prefmem" : "mem", (bridge->flags & IORESOURCE_PREFETCH)? "prefmem" : "mem",
@ -357,7 +375,7 @@ void compute_allocate_resource(
resource->flags &= ~IORESOURCE_STORED; resource->flags &= ~IORESOURCE_STORED;
base += size; base += size;
printk_spew( printk(BIOS_SPEW,
"%s %02x * [0x%08Lx - 0x%08Lx] %s\n", "%s %02x * [0x%08Lx - 0x%08Lx] %s\n",
dev_path(dev), dev_path(dev),
resource->index, resource->index,
@ -375,7 +393,7 @@ void compute_allocate_resource(
*/ */
bridge->size = round(base, bridge->gran) - bridge->base; bridge->size = round(base, bridge->gran) - bridge->base;
printk_spew("%s compute_allocate_%s: base: %08Lx size: %08Lx align: %d gran: %d done\n", printk(BIOS_SPEW, "%s compute_allocate_%s: base: %08Lx size: %08Lx align: %d gran: %d done\n",
dev_path(bus->dev), dev_path(bus->dev),
(bridge->flags & IORESOURCE_IO)? "io": (bridge->flags & IORESOURCE_IO)? "io":
(bridge->flags & IORESOURCE_PREFETCH)? "prefmem" : "mem", (bridge->flags & IORESOURCE_PREFETCH)? "prefmem" : "mem",
@ -385,7 +403,7 @@ void compute_allocate_resource(
} }
#if CONFIG_CONSOLE_VGA == 1 #if CONFIG_CONSOLE_VGA == 1
device_t vga_pri = 0; struct device * vga_pri = 0;
static void allocate_vga_resource(void) static void allocate_vga_resource(void)
{ {
#warning "FIXME modify allocate_vga_resource so it is less pci centric!" #warning "FIXME modify allocate_vga_resource so it is less pci centric!"
@ -441,7 +459,7 @@ static void allocate_vga_resource(void)
if (vga) { if (vga) {
/* vga is first add on card or the only onboard vga */ /* vga is first add on card or the only onboard vga */
printk_debug("Allocating VGA resource %s\n", dev_path(vga)); printk(BIOS_DEBUG, "Allocating VGA resource %s\n", dev_path(vga));
/* All legacy VGA cards have MEM & I/O space registers */ /* All legacy VGA cards have MEM & I/O space registers */
vga->command |= (PCI_COMMAND_MEMORY | PCI_COMMAND_IO); vga->command |= (PCI_COMMAND_MEMORY | PCI_COMMAND_IO);
vga_pri = vga; vga_pri = vga;
@ -449,7 +467,7 @@ static void allocate_vga_resource(void)
} }
/* Now walk up the bridges setting the VGA enable */ /* Now walk up the bridges setting the VGA enable */
while(bus) { while(bus) {
printk_debug("Setting PCI_BRIDGE_CTL_VGA for bridge %s\n", printk(BIOS_DEBUG, "Setting PCI_BRIDGE_CTL_VGA for bridge %s\n",
dev_path(bus->dev)); dev_path(bus->dev));
bus->bridge_ctrl |= PCI_BRIDGE_CTL_VGA; bus->bridge_ctrl |= PCI_BRIDGE_CTL_VGA;
bus = (bus == bus->dev->bus)? 0 : bus->dev->bus; bus = (bus == bus->dev->bus)? 0 : bus->dev->bus;
@ -472,25 +490,30 @@ static void allocate_vga_resource(void)
* assign_resources() -> device_operation::set_resources() * assign_resources() -> device_operation::set_resources()
* device_operation::set_resources() -> assign_resources() * device_operation::set_resources() -> assign_resources()
*/ */
void assign_resources(struct bus *bus) void phase4_assign_resources(struct bus *bus)
{ {
struct device *curdev; struct device *curdev;
printk_spew("%s assign_resources, bus %d link: %d\n", printk(BIOS_SPEW, "%s assign_resources, bus %d link: %d\n",
dev_path(bus->dev), bus->secondary, bus->link); dev_path(bus->dev), bus->secondary, bus->link);
for(curdev = bus->children; curdev; curdev = curdev->sibling) { for(curdev = bus->children; curdev; curdev = curdev->sibling) {
if (!curdev->enabled || !curdev->resources) { if (!curdev->enabled || !curdev->resources) {
continue; continue;
} }
if (!curdev->ops || !curdev->ops->set_resources) { if (!curdev->ops) {
printk_err("%s missing set_resources\n", printk(BIOS_ERR, "%s missing ops\n",
dev_path(curdev)); dev_path(curdev));
continue; continue;
} }
curdev->ops->set_resources(curdev); if (!curdev->ops->phase4_set_resources) {
printk(BIOS_ERR, "%s ops has no missing phase4_set_resources\n",
dev_path(curdev));
continue;
}
curdev->ops->phase4_set_resources(curdev);
} }
printk_spew("%s assign_resources, bus %d link: %d\n", printk(BIOS_SPEW, "%s assign_resources, bus %d link: %d\n",
dev_path(bus->dev), bus->secondary, bus->link); dev_path(bus->dev), bus->secondary, bus->link);
} }
@ -500,28 +523,32 @@ void assign_resources(struct bus *bus)
* @param dev the device whose resources are to be enabled * @param dev the device whose resources are to be enabled
* *
* Enable resources of the device by calling the device specific * Enable resources of the device by calling the device specific
* enable_resources() method. * phase5() method.
* *
* The parent's resources should be enabled first to avoid having enabling * The parent's resources should be enabled first to avoid having enabling
* order problem. This is done by calling the parent's enable_resources() * order problem. This is done by calling the parent's phase5()
* method and let that method to call it's children's enable_resoruces() * method and let that method to call it's children's phase5()
* method via the (global) enable_childrens_resources(). * method via the (global) phase5_children().
* *
* Indirect mutual recursion: * Indirect mutual recursion:
* enable_resources() -> device_operations::enable_resource() * dev_phase5() -> device_operations::phase5()
* device_operations::enable_resource() -> enable_children_resources() * device_operations::phase5() -> phase5_children()
* enable_children_resources() -> enable_resources() * phase5_children() -> dev_phase5()
*/ */
void enable_resources(struct device *dev) void dev_phase5(struct device *dev)
{ {
if (!dev->enabled) { if (!dev->enabled) {
return; return;
} }
if (!dev->ops || !dev->ops->enable_resources) { if (!dev->ops) {
printk_err("%s missing enable_resources\n", dev_path(dev)); printk(BIOS_ERR, "%s missing ops\n", dev_path(dev));
return; return;
} }
dev->ops->enable_resources(dev); if (!dev->ops->phase5) {
printk(BIOS_ERR, "%s ops are missing phase5\n", dev_path(dev));
return;
}
dev->ops->phase5(dev);
} }
/** /**
@ -545,6 +572,57 @@ int reset_bus(struct bus *bus)
return 0; return 0;
} }
/**
* @brief Do very early setup for all devices in the global device list.
*
* Starting at the first device on the global device link list,
* walk the list and call the device's phase1() method to do very
* early setup. phase1 should only used for devices that CAN NOT use printk,
* or that are part of making printk work.
*/
void dev_phase1(void)
{
struct device *dev;
post_code(0x31);
for(dev = all_devices; dev; dev = dev->next) {
if (dev->ops && dev->ops->phase1)
{
dev->ops->phase1(dev);
}
}
post_code(0x3e);
/* printk should be working at this point ... */
printk(BIOS_INFO, "Phase 1: done\n");
post_code(0x3f);
}
/**
* @brief Do early setup for all devices in the global device list.
*
* Starting at the first device on the global device link list,
* walk the list and call the device's phase2() method to do
* early setup. You can use printk() in phase 2 methods.
*/
void dev_phase2(void)
{
struct device *dev;
post_code(0x41);
printk(BIOS_INFO, "Phase 2: early setup ...\n");
for(dev = all_devices; dev; dev = dev->next) {
if (dev->ops && dev->ops->phase1)
{
printk(BIOS_DEBUG, "%s phase2\n", dev_path(dev));
dev->ops->phase1(dev);
}
}
post_code(0x4e);
printk(BIOS_INFO, "Phase 2: done\n");
post_code(0x4f);
}
/** /**
* @brief Scan for devices on a bus. * @brief Scan for devices on a bus.
* *
@ -557,26 +635,26 @@ int reset_bus(struct bus *bus)
* *
* @return The maximum bus number found, after scanning all subordinate busses * @return The maximum bus number found, after scanning all subordinate busses
*/ */
unsigned int scan_bus(device_t bus, unsigned int max) unsigned int dev_phase3(struct device * bus, unsigned int max)
{ {
unsigned int new_max; unsigned int new_max;
int do_scan_bus; int do_phase3;
if ( !bus || if ( !bus ||
!bus->enabled || !bus->enabled ||
!bus->ops || !bus->ops ||
!bus->ops->scan_bus) !bus->ops->phase3)
{ {
return max; return max;
} }
do_scan_bus = 1; do_phase3 = 1;
while(do_scan_bus) { while(do_phase3) {
int link; int link;
new_max = bus->ops->scan_bus(bus, max); new_max = bus->ops->phase3(bus, max);
do_scan_bus = 0; do_phase3 = 0;
for(link = 0; link < bus->links; link++) { for(link = 0; link < bus->links; link++) {
if (bus->link[link].reset_needed) { if (bus->link[link].reset_needed) {
if (reset_bus(&bus->link[link])) { if (reset_bus(&bus->link[link])) {
do_scan_bus = 1; do_phase3 = 1;
} else { } else {
bus->bus->reset_needed = 1; bus->bus->reset_needed = 1;
} }
@ -609,21 +687,25 @@ unsigned int scan_bus(device_t bus, unsigned int max)
* scan_bus() method also has to create the device structure and attach * scan_bus() method also has to create the device structure and attach
* it to the device tree. * it to the device tree.
*/ */
void dev_enumerate(void) void dev_root_phase3(void)
{ {
struct device *root; struct device *root;
unsigned subordinate; unsigned subordinate;
printk_info("Enumerating buses...\n"); printk(BIOS_INFO, "Phase 3: Enumerating buses...\n");
root = &dev_root; root = &dev_root;
if (root->chip_ops && root->chip_ops->enable_dev) { if (root->chip_ops && root->chip_ops->enable_dev) {
root->chip_ops->enable_dev(root); root->chip_ops->enable_dev(root);
} }
if (!root->ops || !root->ops->scan_bus) { if (!root->ops) {
printk_err("dev_root missing scan_bus operation"); printk(BIOS_ERR, "dev_root missing 'ops' initialization\n");
return; return;
} }
subordinate = scan_bus(root, 0); if (!root->ops->phase3) {
printk_info("done\n"); printk(BIOS_ERR, "dev_root ops struct missing 'phase3' initialization in ops structure");
return;
}
subordinate = dev_phase3(root, 0);
printk(BIOS_INFO, "done\n");
} }
/** /**
@ -640,26 +722,30 @@ void dev_enumerate(void)
* Since the assignment is hierarchical we set the values into the dev_root * Since the assignment is hierarchical we set the values into the dev_root
* struct. * struct.
*/ */
void dev_configure(void) void dev_phase4(void)
{ {
struct resource *io, *mem; struct resource *io, *mem;
struct device *root; struct device *root;
printk_info("Allocating resources...\n"); printk(BIOS_INFO, "Allocating resources...\n");
root = &dev_root; root = &dev_root;
if (!root->ops || !root->ops->read_resources) { if (!root->ops) {
printk_err("dev_root missing read_resources\n"); printk(BIOS_ERR, "dev_root missing ops initialization\n");
return; return;
} }
if (!root->ops || !root->ops->set_resources) { if (!root->ops->phase4_read_resources) {
printk_err("dev_root missing set_resources\n"); printk(BIOS_ERR, "dev_root ops missing read_resources\n");
return;
}
if (!root->ops->phase4_set_resources) {
printk(BIOS_ERR, "dev_root ops missing set_resources\n");
return; return;
} }
printk_info("Reading resources...\n"); printk(BIOS_INFO, "Reading resources...\n");
root->ops->read_resources(root); root->ops->phase4_read_resources(root);
printk_info("Done reading resources.\n"); printk(BIOS_INFO, "Done reading resources.\n");
/* Get the resources */ /* Get the resources */
io = &root->resource[0]; io = &root->resource[0];
@ -681,15 +767,15 @@ void dev_configure(void)
#endif #endif
/* Store the computed resource allocations into device registers ... */ /* Store the computed resource allocations into device registers ... */
printk_info("Setting resources...\n"); printk(BIOS_INFO, "Setting resources...\n");
root->ops->set_resources(root); root->ops->phase4_set_resources(root);
printk_info("Done setting resources.\n"); printk(BIOS_INFO, "Done setting resources.\n");
#if 0 #if 0
mem->flags |= IORESOURCE_STORED; mem->flags |= IORESOURCE_STORED;
report_resource_stored(root, mem, ""); report_resource_stored(root, mem, "");
#endif #endif
printk_info("Done allocating resources.\n"); printk(BIOS_INFO, "Done allocating resources.\n");
} }
/** /**
@ -698,14 +784,14 @@ void dev_configure(void)
* Starting at the root, walk the tree and enable all devices/bridges by * Starting at the root, walk the tree and enable all devices/bridges by
* calling the device's enable_resources() method. * calling the device's enable_resources() method.
*/ */
void dev_enable(void) void dev_root_phase5(void)
{ {
printk_info("Enabling resources...\n"); printk(BIOS_INFO, "Enabling resources...\n");
/* now enable everything. */ /* now enable everything. */
enable_resources(&dev_root); dev_phase5(&dev_root);
printk_info("done.\n"); printk(BIOS_INFO, "done.\n");
} }
/** /**
@ -715,24 +801,24 @@ void dev_enable(void)
* walk the list and call the device's init() method to do deivce * walk the list and call the device's init() method to do deivce
* specific setup. * specific setup.
*/ */
void dev_initialize(void) void dev_phase6(void)
{ {
struct device *dev; struct device *dev;
printk_info("Initializing devices...\n"); printk(BIOS_INFO, "Phase 6: Initializing devices...\n");
for(dev = all_devices; dev; dev = dev->next) { for(dev = all_devices; dev; dev = dev->next) {
if (dev->enabled && !dev->initialized && if (dev->enabled && !dev->initialized &&
dev->ops && dev->ops->init) dev->ops && dev->ops->phase6)
{ {
if (dev->path.type == DEVICE_PATH_I2C) { if (dev->path.type == DEVICE_PATH_I2C) {
printk_debug("smbus: %s[%d]->", printk(BIOS_DEBUG, "smbus: %s[%d]->",
dev_path(dev->bus->dev), dev->bus->link); dev_path(dev->bus->dev), dev->bus->link);
} }
printk_debug("%s init\n", dev_path(dev)); printk(BIOS_DEBUG, "%s init\n", dev_path(dev));
dev->initialized = 1; dev->initialized = 1;
dev->ops->init(dev); dev->ops->phase6(dev);
} }
} }
printk_info("Devices initialized\n"); printk(BIOS_INFO, "Phase 6:Devices initialized\n");
} }

46
devices/device_util.c
View file

@ -1,4 +1,6 @@
/* /*
* Author(s) unknown
*
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
@ -15,10 +17,11 @@
*/ */
#include <console/console.h> #include <console/console.h>
#include <arch/io.h>
#include <device/device.h> #include <device/device.h>
#include <device/path.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/resource.h> #include <device/pci_ids.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
/** /**
@ -29,9 +32,9 @@
* @return pointer to a device structure for the device on bus at path * @return pointer to a device structure for the device on bus at path
* or 0/NULL if no device is found * or 0/NULL if no device is found
*/ */
device_t find_dev_path(struct bus *parent, struct device_path *path) struct device * find_dev_path(struct bus *parent, struct device_path *path)
{ {
device_t child; struct device * child;
for(child = parent->children; child; child = child->sibling) { for(child = parent->children; child; child = child->sibling) {
if (path_eq(path, &child->path)) { if (path_eq(path, &child->path)) {
break; break;
@ -47,9 +50,9 @@ device_t find_dev_path(struct bus *parent, struct device_path *path)
* @param path The relative path from the bus to the appropriate device * @param path The relative path from the bus to the appropriate device
* @return pointer to a device structure for the device on bus at path * @return pointer to a device structure for the device on bus at path
*/ */
device_t alloc_find_dev(struct bus *parent, struct device_path *path) struct device * alloc_find_dev(struct bus *parent, struct device_path *path)
{ {
device_t child; struct device * child;
child = find_dev_path(parent, path); child = find_dev_path(parent, path);
if (!child) { if (!child) {
child = alloc_dev(parent, path); child = alloc_dev(parent, path);
@ -142,7 +145,7 @@ struct device *dev_find_class(unsigned int class, struct device *from)
} }
const char *dev_path(device_t dev) const char *dev_path(struct device * dev)
{ {
static char buffer[DEVICE_PATH_MAX]; static char buffer[DEVICE_PATH_MAX];
buffer[0] = '\0'; buffer[0] = '\0';
@ -193,7 +196,7 @@ const char *dev_path(device_t dev)
sprintf(buffer, "CPU_BUS: %02x", dev->path.u.cpu_bus.id); sprintf(buffer, "CPU_BUS: %02x", dev->path.u.cpu_bus.id);
break; break;
default: default:
printk_err("Unknown device path type: %d\n", dev->path.type); printk(BIOS_ERR, "Unknown device path type: %d\n", dev->path.type);
break; break;
} }
} }
@ -244,7 +247,7 @@ int path_eq(struct device_path *path1, struct device_path *path2)
equal = (path1->u.cpu_bus.id == path2->u.cpu_bus.id); equal = (path1->u.cpu_bus.id == path2->u.cpu_bus.id);
break; break;
default: default:
printk_err("Uknown device type: %d\n", path1->type); printk(BIOS_ERR, "Uknown device type: %d\n", path1->type);
break; break;
} }
} }
@ -256,7 +259,7 @@ int path_eq(struct device_path *path1, struct device_path *path2)
* If so remove the allocation. * If so remove the allocation.
* @param dev The device to find the resource on * @param dev The device to find the resource on
*/ */
void compact_resources(device_t dev) void compact_resources(struct device * dev)
{ {
struct resource *resource; struct resource *resource;
int i; int i;
@ -264,7 +267,8 @@ void compact_resources(device_t dev)
for(i = 0; i < dev->resources;) { for(i = 0; i < dev->resources;) {
resource = &dev->resource[i]; resource = &dev->resource[i];
if (!resource->flags) { if (!resource->flags) {
memmove(resource, resource + 1, dev->resources - i); /* note: memmove was used here. But this can never overlap, right? */
memcpy(resource, resource + 1, dev->resources - i);
dev->resources -= 1; dev->resources -= 1;
memset(&dev->resource[dev->resources], 0, sizeof(*resource)); memset(&dev->resource[dev->resources], 0, sizeof(*resource));
} else { } else {
@ -280,7 +284,7 @@ void compact_resources(device_t dev)
* @param index The index of the resource on the device. * @param index The index of the resource on the device.
* @return the resource if it already exists * @return the resource if it already exists
*/ */
struct resource *probe_resource(device_t dev, unsigned index) struct resource *probe_resource(struct device * dev, unsigned index)
{ {
struct resource *resource; struct resource *resource;
int i; int i;
@ -302,7 +306,7 @@ struct resource *probe_resource(device_t dev, unsigned index)
* @param dev The device to find the resource on * @param dev The device to find the resource on
* @param index The index of the resource on the device. * @param index The index of the resource on the device.
*/ */
struct resource *new_resource(device_t dev, unsigned index) struct resource *new_resource(struct device * dev, unsigned index)
{ {
struct resource *resource; struct resource *resource;
@ -338,14 +342,14 @@ struct resource *new_resource(device_t dev, unsigned index)
* @param dev The device to find the resource on * @param dev The device to find the resource on
* @param index The index of the resource on the device. * @param index The index of the resource on the device.
*/ */
struct resource *find_resource(device_t dev, unsigned index) struct resource *find_resource(struct device * dev, unsigned index)
{ {
struct resource *resource; struct resource *resource;
/* See if there is a resource with the appropriate index */ /* See if there is a resource with the appropriate index */
resource = probe_resource(dev, index); resource = probe_resource(dev, index);
if (!resource) { if (!resource) {
printk_emerg("%s missing resource: %02x\n", printk(BIOS_EMERG, "%s missing resource: %02x\n",
dev_path(dev), index); dev_path(dev), index);
die(""); die("");
} }
@ -443,7 +447,7 @@ const char *resource_type(struct resource *resource)
* @param dev the device the stored resorce lives on * @param dev the device the stored resorce lives on
* @param resource the resource that was just stored. * @param resource the resource that was just stored.
*/ */
void report_resource_stored(device_t dev, struct resource *resource, const char *comment) void report_resource_stored(struct device * dev, struct resource *resource, const char *comment)
{ {
if (resource->flags & IORESOURCE_STORED) { if (resource->flags & IORESOURCE_STORED) {
unsigned char buf[10]; unsigned char buf[10];
@ -458,7 +462,7 @@ void report_resource_stored(device_t dev, struct resource *resource, const char
sprintf(buf, "bus %02x ", dev->link[0].secondary); sprintf(buf, "bus %02x ", dev->link[0].secondary);
#endif #endif
} }
printk_debug( printk(BIOS_DEBUG,
"%s %02x <- [0x%010Lx - 0x%010Lx] %s%s%s\n", "%s %02x <- [0x%010Lx - 0x%010Lx] %s%s%s\n",
dev_path(dev), dev_path(dev),
resource->index, resource->index,
@ -520,14 +524,14 @@ void search_global_resources(
} }
} }
void dev_set_enabled(device_t dev, int enable) void dev_set_enabled(struct device * dev, int enable)
{ {
if (dev->enabled == enable) { if (dev->enabled == enable) {
return; return;
} }
dev->enabled = enable; dev->enabled = enable;
if (dev->ops && dev->ops->enable) { if (dev->ops && dev->ops->phase5) {
dev->ops->enable(dev); dev->ops->phase5(dev);
} }
else if (dev->chip_ops && dev->chip_ops->enable_dev) { else if (dev->chip_ops && dev->chip_ops->enable_dev) {
dev->chip_ops->enable_dev(dev); dev->chip_ops->enable_dev(dev);
@ -536,7 +540,7 @@ void dev_set_enabled(device_t dev, int enable)
void disable_children(struct bus *bus) void disable_children(struct bus *bus)
{ {
device_t child; struct device * child;
for(child = bus->children; child; child = child->sibling) { for(child = bus->children; child; child = child->sibling) {
int link; int link;
for(link = 0; link < child->links; link++) { for(link = 0; link < child->links; link++) {