X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fsconfig%2Fmain.c;h=dab04db321139e9ee3dff1ca3240733fd3b63e7a;hb=5ff7c13e858a31addf1558731a12cf6c753b576d;hp=4abfd2c3bbc26180c02e5a1df1909e297ccf6e4f;hpb=7c1f6b84896465321e3051ed7b153f18328c3b12;p=coreboot.git

diff --git a/util/sconfig/main.c b/util/sconfig/main.c
old mode 100755
new mode 100644
index 4abfd2c3b..dab04db32
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -59,6 +59,8 @@ static struct device *new_dev(struct device *parent, struct device *bus) {
 	dev->id = ++devcount;
 	dev->parent = parent;
 	dev->bus = bus;
+	dev->subsystem_vendor = -1;
+	dev->subsystem_device = -1;
 	head->next = dev;
 	head = dev;
 	return dev;
@@ -129,6 +131,13 @@ struct device *new_chip(struct device *parent, struct device *bus, char *path) {
 
 	struct stat st;
 	char *chip_h = malloc(strlen(path)+12);
+	sprintf(chip_h, "src/%s", path);
+	if ((stat(chip_h, &st) == -1) && (errno == ENOENT)) {
+		fprintf(stderr, "ERROR: Chip component %s does not exist.\n",
+				path);
+		exit(1);
+	}
+
 	sprintf(chip_h, "src/%s/chip.h", path);
 	if ((stat(chip_h, &st) == -1) && (errno == ENOENT))
 		new_chip->chiph_exists = 0;
@@ -279,6 +288,18 @@ void add_register(struct device *dev, char *name, char *val) {
 	}
 }
 
+void add_pci_subsystem_ids(struct device *dev, int vendor, int device, int inherit)
+{
+	if (dev->bustype != PCI && dev->bustype != PCI_DOMAIN) {
+		printf("ERROR: 'subsystem' only allowed for PCI devices\n");
+		exit(1);
+	}
+
+	dev->subsystem_vendor = vendor;
+	dev->subsystem_device = device;
+	dev->inherit_subsystem = inherit;
+}
+
 static void pass0(FILE *fil, struct device *ptr) {
 	if (ptr->type == device && ptr->id == 0)
 		fprintf(fil, "struct bus %s_links[];\n", ptr->name);
@@ -303,6 +324,12 @@ static void pass1(FILE *fil, struct device *ptr) {
 		fprintf(fil, "},\n");
 		fprintf(fil, "\t.enabled = %d,\n", ptr->enabled);
 		fprintf(fil, "\t.on_mainboard = 1,\n");
+		if (ptr->subsystem_vendor > 0)
+			fprintf(fil, "\t.subsystem_vendor = 0x%04x,\n", ptr->subsystem_vendor);
+
+		if (ptr->subsystem_device > 0)
+			fprintf(fil, "\t.subsystem_device = 0x%04x,\n", ptr->subsystem_device);
+
 		if (ptr->rescnt > 0) {
 			fprintf(fil, "\t.resource_list = &%s_res[0],\n", ptr->name);
 		}
@@ -392,6 +419,28 @@ static void walk_device_tree(FILE *fil, struct device *ptr, void (*func)(FILE *,
 	} while (ptr);
 }
 
+static void inherit_subsystem_ids(FILE *file, struct device *dev)
+{
+	struct device *p;
+
+	if (dev->subsystem_vendor != -1 && dev->subsystem_device != -1) {
+		/* user already gave us a subsystem vendor/device */
+		return;
+	}
+
+	for(p = dev; p && p != p->parent; p = p->parent) {
+
+		if (p->bustype != PCI && p->bustype != PCI_DOMAIN)
+			continue;
+
+		if (p->inherit_subsystem) {
+			dev->subsystem_vendor = p->subsystem_vendor;
+			dev->subsystem_device = p->subsystem_device;
+			break;
+		}
+	}
+}
+
 int main(int argc, char** argv) {
 	if (argc != 3) {
 		printf("usage: sconfig vendor/mainboard outputdir\n");
@@ -444,9 +493,12 @@ int main(int argc, char** argv) {
 		h = h->next;
 		fprintf(staticc, "#include \"%s/chip.h\"\n", h->name);
 	}
+
+	walk_device_tree(staticc, &root, inherit_subsystem_ids, NULL);
+
 	fprintf(staticc, "\n/* pass 0 */\n");
 	walk_device_tree(staticc, &root, pass0, NULL);
-	fprintf(staticc, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\nstruct device **last_dev_p = &%s.next;\n", lastdev->name);
+	fprintf(staticc, "\n/* pass 1 */\nstruct mainboard_config mainboard_info_0;\nstruct device *last_dev = &%s;\n", lastdev->name);
 	walk_device_tree(staticc, &root, pass1, NULL);
 
 	fclose(staticc);