From 270a908646273461b41e591739d778d3d675ff6f Mon Sep 17 00:00:00 2001
From: Sven Schnelle <svens@stackframe.org>
Date: Tue, 1 Mar 2011 19:58:15 +0000
Subject: Add subsystemid option to sconfig

Allow user to add 'subsystemid <vendor> <device> [inherit]' to devicetree.cb for
PCI and PCI domain devices.

Example:

	device pci 00.0 on
	       subsystemid dead beef
	end

If the user wants to have this ID inherited to all subdevices/functions,
he can add 'inherit', like in the following example:

	device pci 00.0 on
	       subsystemid dead beef inherit
	end

If the user don't want to inherit a Subsystem for a single device, he can
specify 'subsystemid 0 0' on this particular device.

Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Peter Stuge <peter@stuge.se>

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6420 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 util/sconfig/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'util/sconfig/main.c')

diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index a3994fbdcd..727fccef75 100755
--- 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;
@@ -279,6 +281,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 +317,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 +412,29 @@ 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;
+	int i =0;
+
+	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), i++) {
+
+		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,6 +487,9 @@ 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 = &%s;\n", lastdev->name);
-- 
cgit v1.2.3