r761 - coreboot-v3/device

Author: hailfinger
Date: 2008-08-14 11:28:28 +0200 (Thu, 14 Aug 2008)
New Revision: 761

Modified:
   coreboot-v3/device/pci_device.c
Log:
Factor out PCI subsystem ID setting. This cleans up the code as well,
arguably fixes some strange behaviour and prepares the code for
per-device subsystem ID setting.
It's the first step to achieve the per-device subsystem goal.

Boot tested on qemu.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Ronald G. Minnich

Modified: coreboot-v3/device/pci_device.c
===================================================================
--- coreboot-v3/device/pci_device.c	2008-08-14 09:25:58 UTC (rev 760)
+++ coreboot-v3/device/pci_device.c	2008-08-14 09:28:28 UTC (rev 761)
@@ -620,26 +620,47 @@
    printk(BIOS_SPEW, "Adding RAM resource (%lld bytes)\n", res->size);
 }

-void pci_dev_enable_resources(struct device *dev)
+void pci_dev_set_subsystem_wrapper(struct device *dev)
 {
    const struct pci_operations *ops;
-	u16 command;
+	u16 vendor = 0;
+	u16 device = 0;

+#warning Per-device subsystem ID has to be set here, but for that we have to extend the dts.
+
+#ifdef HAVE_MAINBOARD_PCI_SUBSYSTEM_ID
+	/* If there's no explicit subsystem ID for this device and the device
+	 * is onboard, use the board defaults. */
+	if (dev->on_mainboard) {
+		if (!vendor)
+			vendor = mainboard_pci_subsystem_vendor;
+		if (!device)
+			device = mainboard_pci_subsystem_device;
+	}
+#endif
    /* Set the subsystem vendor and device ID for mainboard devices. */
    ops = ops_pci(dev);

-#ifdef HAVE_MAINBOARD_PCI_SUBSYSTEM_ID
-	if (dev->on_mainboard && ops && ops->set_subsystem) {
+	/* If either vendor or device is zero, we leave it as is. */
+	if (ops && ops->set_subsystem && vendor && device) {
    	printk(BIOS_DEBUG,
    	       "%s: Setting subsystem VID/DID to %02x/%02x\n",
-		       dev_path(dev), mainboard_pci_subsystem_vendor,
-		       mainboard_pci_subsystem_device);
+		       dev_path(dev), vendor, device);

-		ops->set_subsystem(dev,	mainboard_pci_subsystem_vendor,
-				   mainboard_pci_subsystem_device);
+		ops->set_subsystem(dev,	vendor, device);
+	} else {
+		printk(BIOS_DEBUG, "%s: Not setting subsystem VID/DID\n",
+			dev_path(dev));
    }
-#endif
+		
+}

+void pci_dev_enable_resources(struct device *dev)
+{
+	u16 command;
+
+	pci_dev_set_subsystem_wrapper(dev);
+
    command = pci_read_config16(dev, PCI_COMMAND);
    command |= dev->command;
    command |= (PCI_COMMAND_PARITY + PCI_COMMAND_SERR); // Error check.
@@ -1008,6 +1029,7 @@
    dev->irq_pin = pci_read_config8(dev, PCI_INTERRUPT_PIN);
    dev->min_gnt = pci_read_config8(dev, PCI_MIN_GNT);
    dev->max_lat = pci_read_config8(dev, PCI_MAX_LAT);
+#warning Per-device subsystem ID should only be read from the device if none has been specified for the device in the dts.
    dev->subsystem_vendor = pci_read_config16(dev, PCI_SUBSYSTEM_VENDOR_ID);
    dev->subsystem_device = pci_read_config16(dev, PCI_SUBSYSTEM_ID);