- Major update of the dynamic device tree so it can handle

  * subtractive resources
  * merging with the static device tree
  * more device types than just pci
- The piece to watch out for is the new enable_resources method that was needed in all of the drivers


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1096 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 33 insertions, 11 deletions

diff --git a/src/include/device/device.h b/src/include/device/device.h
index 21e5dfc5c8..5529abc7f2 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <device/resource.h>
+#include <device/path.h>
 
 struct device;
 typedef struct device * device_t;
@@ -10,33 +11,42 @@ typedef struct device * device_t;
 struct device_operations {
 	void (*read_resources)(device_t dev);
 	void (*set_resources)(device_t dev);
+	void (*enable_resources)(device_t dev);
 	void (*init)(device_t dev);
 	unsigned int (*scan_bus)(device_t  bus, unsigned int max);
 	void (*enable)(device_t dev);
 };
 
 
+struct bus {
+	device_t 	dev;		/* This bridge device */
+	device_t 	children;	/* devices behind this bridge */
+	unsigned	bridge_ctrl;	/* Bridge control register */
+	unsigned char	link;		/* The index of this link */
+	unsigned char	secondary; 	/* secondary bus number */
+	unsigned char	subordinate;	/* max subordinate bus number */
+	unsigned char   cap;		/* PCi capability offset */
+};
+
 #define MAX_RESOURCES 6
+#define MAX_LINKS     3
 /*
  * There is one device structure for each slot-number/function-number
  * combination:
  */
 
 struct device {
-	device_t bus;		/* bus this device is on */
-	device_t children;	/* devices behind this bridge */
-	device_t sibling;	/* next device on this bus */
-	device_t next;		/* chain of all devices */
+	struct bus *	bus;		/* bus this device is on */
+	device_t	sibling;	/* next device on this bus */
+	device_t	next;		/* chain of all devices */
 
-	unsigned int	devfn;		/* encoded device & function index */
+	struct device_path path;
 	unsigned short	vendor;
 	unsigned short	device;
 	unsigned int	class;		/* 3 bytes: (base,sub,prog-if) */
 	unsigned int	hdr_type;	/* PCI header type */
 	unsigned int    enable : 1;	/* set if we should enable the device */
 
-	unsigned char	secondary; 	/* secondary bus number */
-	unsigned char	subordinate;	/* max subordinate bus number */
 	uint8_t command;
 	/*
 	 * In theory, the irq level can be read from configuration
@@ -56,6 +66,10 @@ struct device {
 	 */
 	struct resource resource[MAX_RESOURCES];
 	unsigned int resources;
+
+	struct bus link[MAX_LINKS];
+	unsigned int links;
+
 	unsigned long rom_address;
 	struct device_operations *ops;
 };
@@ -65,19 +79,22 @@ extern struct device	*all_devices;	/* list of all devices */
 
 
 /* Generic device interface functions */
+extern device_t alloc_dev(struct bus *parent, struct device_path *path);
 extern void dev_enumerate(void);
 extern void dev_configure(void);
 extern void dev_enable(void);
 extern void dev_initialize(void);
 
 /* Generic device helper functions */
-void append_device(device_t dev);
-void compute_allocate_resource(device_t bus, struct resource *bridge,
+extern void compute_allocate_resource(struct bus *bus, struct resource *bridge,
 	unsigned long type_mask, unsigned long type);
-void assign_resources(device_t bus);
-void enumerate_static_device(void);
+extern void assign_resources(struct bus *bus);
+extern void enable_resources(struct device *dev);
+extern void enumerate_static_device(void);
+extern const char *dev_path(device_t dev);
 
 /* Helper functions */
+device_t alloc_find_dev(struct bus *bus, struct device_path *path);
 device_t dev_find_device (unsigned int vendor, unsigned int device, device_t from);
 device_t dev_find_class (unsigned int class, device_t from);
 device_t dev_find_slot (unsigned int bus, unsigned int devfn);
@@ -88,5 +105,10 @@ device_t dev_find_slot (unsigned int bus, unsigned int devfn);
 #define DEVICE_IO_ALIGN 16 
 #define DEVICE_MEM_ALIGN 4096
 
+struct device_operations default_dev_ops_root;
+extern void root_dev_read_resources(device_t dev);
+extern void root_dev_set_resources(device_t dev);
+extern unsigned int walk_static_devices(device_t bus, unsigned int max);
+extern void enable_childrens_resources(device_t dev);
 
 #endif /* DEVICE_H */