[commit] r5190 - trunk/src/northbridge/intel/i945

[repository service]

Author: stepan
Date: Fri Mar  5 19:25:19 2010
New Revision: 5190
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5190

Log:
i945 mini patch:
- don't skip the reset on S4 violations. Specs ask us to do this so we do it
- hlt on waiting for reset instead of hot looping.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/northbridge/intel/i945/raminit.c

Modified: trunk/src/northbridge/intel/i945/raminit.c
==============================================================================
--- trunk/src/northbridge/intel/i945/raminit.c	Fri Mar  5 19:03:49 2010	(r5189)
+++ trunk/src/northbridge/intel/i945/raminit.c	Fri Mar  5 19:25:19 2010	(r5190)
@@ -236,8 +236,9 @@
    if (reg8 & ((1<<7)|(1<<2))) {
    	if (reg8 & (1<<2)) {
    		printk_debug("SLP S4# Assertion Width Violation.\n");
-
+			/* Write back clears bit 2 */
    		pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);
+			do_reset = 1;

}

@@ -257,7 +258,7 @@
    		printk_debug("Reset required.\n");
    		outb(0x00, 0xcf9);
    		outb(0x0e, 0xcf9);
-			for (;;) ; /* Wait for reset! */
+			for (;;) asm("hlt"); /* Wait for reset! */
    	}
    }