[openfirmware] [commit] r1854 - cpu/x86/pc/olpc/via

[repository service]

Author: wmb
Date: Thu Jul  1 19:34:33 2010
New Revision: 1854
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1854

Log:
OLPC XO-1.5 - perform additional PCI config register restoration
by including startpcirestore.fth at the appropriate place in the
resume-from-S3 sequence.

Modified:
   cpu/x86/pc/olpc/via/romreset.bth

Modified: cpu/x86/pc/olpc/via/romreset.bth
==============================================================================
--- cpu/x86/pc/olpc/via/romreset.bth	Thu Jul  1 19:32:54 2010	(r1853)
+++ cpu/x86/pc/olpc/via/romreset.bth	Thu Jul  1 19:34:33 2010	(r1854)
@@ -248,6 +248,10 @@
          ax jmp         \ Jump in 32-bit protected mode
       then
 
+      \ This only works if prep-rm has already been executed;
+      \ otherwise it will hang trying to re-enable SMM
+      fload ${BP}/cpu/x86/pc/olpc/via/startpcirestore.fth  \ SD host controller PCI BARs
+
       facs-adr h# c + #) ax mov  ax ax or  0<>  if
          \ Resume in real mode for ACPI operating systems
          \ Linear wakeup address is in EAX