[coreboot-gerrit] Patch set updated for coreboot: 55536d7 pci: don't load vga option rom before S3 check

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2979

-gerrit

commit 55536d7ec62ad495adc8e4851bfc264344c68436
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Thu Mar 28 15:59:19 2013 -0500

    pci: don't load vga option rom before S3 check
    
    The pci device code was probing and loading the option rom before
    it did the S3 resume check for VGA option roms. Instead move this
    check before probing and loading so that we don't unnecessarily
    do work.
    
    Change-Id: If2e62d0c0e4b34b4f1bcd56ebcb9d3f54c6d0d24
    Signed-off-by: Aaron Durbin <adurbin at chromium.org>
---
 src/device/pci_device.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index ff334fe..4c5a814 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -685,14 +685,6 @@ void pci_dev_init(struct device *dev)
 	}
 #endif
 
-	rom = pci_rom_probe(dev);
-	if (rom == NULL)
-		return;
-
-	ram = pci_rom_load(dev, rom);
-	if (ram == NULL)
-		return;
-
 #if CONFIG_HAVE_ACPI_RESUME && !CONFIG_S3_VGA_ROM_RUN
 	/* If S3_VGA_ROM_RUN is disabled, skip running VGA option
 	 * ROMs when coming out of an S3 resume.
@@ -701,6 +693,15 @@ void pci_dev_init(struct device *dev)
 		((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA))
 		return;
 #endif
+
+	rom = pci_rom_probe(dev);
+	if (rom == NULL)
+		return;
+
+	ram = pci_rom_load(dev, rom);
+	if (ram == NULL)
+		return;
+
 	run_bios(dev, (unsigned long)ram);
 #if CONFIG_CHROMEOS
 	oprom_is_loaded = 1;