Patchwork M2v-mx_se asus : s3 sleeping broken since rev4625 ruik

login
register
about
Submitter Rudolf Marek
Date 2009-12-27 23:54:08
Message ID <4B37F3A0.8090108@assembler.cz>
Download mbox | patch
Permalink /patch/715/
State New
Headers show

Comments

Rudolf Marek - 2009-12-27 23:54:08
Hi,

I think you can get it to work again if you simply comment out in lib/cbmem.c
line 186  //acpi_slp_type == 0;

and in acpi.c

a return on line 592 this will let the stuff running even when no resume area 
was defined/filled. The region is still marked reserved although I think you 
will need bit more fix to Kconfig.

See attached patch. Totally untested but I think it could work.

Rudolf
Rudolf Marek - 2009-12-28 09:43:28
Hi,

I can confirm the patch works fine. The board reserves the memory on 31MB as 
hole. So, the saving stuff can be left unimplemented for now.

[    0.000000]  BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
[    0.000000]  BIOS-e820: 000000000009f000 - 00000000000a0000 (reserved)
[    0.000000]  BIOS-e820: 00000000000f0000 - 0000000000100000 (reserved)
[    0.000000]  BIOS-e820: 0000000000100000 - 0000000001f00000 (usable)
[    0.000000]  BIOS-e820: 0000000001f00000 - 0000000002000000 (reserved)
[    0.000000]  BIOS-e820: 0000000002000000 - 0000000017fe7000 (usable)
[    0.000000]  BIOS-e820: 0000000017fe7000 - 0000000018000000 (reserved)
[    0.000000]  BIOS-e820: 00000000e0000000 - 00000000f0000000 (reserved)

High Tables Base is 17ff0000, but that little missing stuff 0000000017fe7000 - 
17ff0000 is from SeaBIOS I think.

I used classic buildtarget/abuild method beccause I think Kconfig has bit 
different configuration.

I'm glad that you have chosen this board! It was a lot of work to get it running ;)

Thanks,
Rudolf

Patch

Index: src/mainboard/asus/m2v-mx_se/Kconfig
===================================================================
--- src/mainboard/asus/m2v-mx_se/Kconfig	(revision 4992)
+++ src/mainboard/asus/m2v-mx_se/Kconfig	(working copy)
@@ -35,6 +35,7 @@ 
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
 	select VGA
+	select HAVE_MAINBOARD_RESOURCES
 
 config MAINBOARD_DIR
 	string
Index: src/lib/cbmem.c
===================================================================
--- src/lib/cbmem.c	(revision 4992)
+++ src/lib/cbmem.c	(working copy)
@@ -184,7 +184,7 @@ 
 	if (acpi_slp_type == 3) {
 		if (!cbmem_reinit(high_tables_base)) {
 			/* Something went wrong, our high memory area got wiped */
-			acpi_slp_type == 0;
+			//acpi_slp_type == 0;
 			cbmem_init(high_tables_base, high_tables_size);
 		}
 	} else {
Index: src/arch/i386/boot/acpi.c
===================================================================
--- src/arch/i386/boot/acpi.c	(revision 4992)
+++ src/arch/i386/boot/acpi.c	(working copy)
@@ -589,7 +589,7 @@ 
 
 	if (!acpi_backup_memory) {
 		printk(BIOS_WARNING, "ACPI: Backup memory missing. No S3 Resume.\n");
-		return;
+		//return;
 	}
 
 	// FIXME this should go into the ACPI backup memory, too. No pork saussages.