Hi!
suspend-to-both implementation that actually works, but I had to
disable some safety checks, and yes, it needs cleanups... It also
produces some ugly warning because we call thaw_processes() twice in a
row. But seems to work.
Pavel
Index: Makefile
===================================================================
RCS file: /cvsroot/suspend/suspend/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- Makefile 12 Mar 2006 16:17:19 -0000 1.21
+++ Makefile 15 Mar 2006 00:21:34 -0000
@@ -1,5 +1,5 @@
#CONFIG_COMPRESS=yes
-#CONFIG_ENCRYPT=yes
+CONFIG_ENCRYPT=yes
CC_FLAGS=-I/usr/local/include
LD_FLAGS=-L/usr/local/lib
@@ -69,8 +69,8 @@
vt.o: vt.c vt.h
gcc -Wall -c vt.c
-suspend: md5.o encrypt.o config.o suspend.c swsusp.h config.h encrypt.h md5.h
- gcc -Wall $(CC_FLAGS) md5.o encrypt.o config.o suspend.c -o suspend $(LD_FLAGS)
+suspend: md5.o encrypt.o config.o suspend.c swsusp.h config.h encrypt.h md5.h s2ram.c dmidecode.c whitelist.c radeontool.c $(S2RAMOBJ)
+ gcc -g -O2 -DCONFIG_BOTH -Wall $(CC_FLAGS) md5.o encrypt.o config.o suspend.c s2ram.c -o suspend $(S2RAMOBJ) $(LD_FLAGS) -lpci
resume: md5.o encrypt.o config.o resume.c swsusp.h config.h encrypt.h md5.h
gcc -Wall $(CC_FLAGS) md5.o encrypt.o config.o resume.c -static -o resume $(LD_FLAGS)
Index: s2ram.c
===================================================================
RCS file: /cvsroot/suspend/suspend/s2ram.c,v
retrieving revision 1.29
diff -u -u -r1.29 s2ram.c
--- s2ram.c 7 Mar 2006 23:54:21 -0000 1.29
+++ s2ram.c 15 Mar 2006 00:21:37 -0000
@@ -162,9 +162,11 @@
vbe_buffer = __save_state(&size);
}
if (flags & RADEON_OFF) {
+#if 0
map_radeon_cntl_mem();
printf("Calling radeon_cmd_light");
radeon_cmd_light("off");
+#endif
}
}
@@ -237,6 +239,7 @@
exit(1);
}
+#ifndef CONFIG_BOTH
int main(int argc, char *argv[])
{
int i;
@@ -299,3 +302,4 @@
s2ram_resume();
return i;
}
+#endif
Index: suspend.c
===================================================================
RCS file: /cvsroot/suspend/suspend/suspend.c,v
retrieving revision 1.22
diff -u -u -r1.22 suspend.c
--- suspend.c 12 Mar 2006 16:17:19 -0000 1.22
+++ suspend.c 15 Mar 2006 00:21:48 -0000
@@ -53,6 +53,7 @@
#define encrypt 0
#define key_name NULL
#endif
+static int s2ram = 1;
static struct config_par parameters[PARAM_NO] = {
{
@@ -518,6 +519,54 @@
ioctl(fd, VT_WAITACTIVE, vt); \
ioctl(fd, KDSKBMODE, ioc2);
+
+static int reset_signature(int fd)
+{
+ int ret, error = 0;
+
+ printf("reseting signature...\n");
+
+ ret = lseek(fd, 0, SEEK_SET);
+ if (ret) {
+ printf("could not seek?! %m\n");
+ return -errno;
+ }
+
+ printf("reading header...\n");
+ memset(&swsusp_header, 0, sizeof(swsusp_header));
+ ret = read(fd, &swsusp_header, PAGE_SIZE);
+ if (ret == PAGE_SIZE) {
+ if (memcmp(SWSUSP_SIG, swsusp_header.sig, 10)) {
+ /* Impossible? We wrote signature and it is not there?! */
+ printf("sig not there?!!...\n");
+ return -EINVAL;
+ }
+ } else {
+ error = ret < 0 ? ret : -EIO;
+ }
+
+ if (!error || !ret) {
+ /* Reset swap signature now */
+ memcpy(swsusp_header.sig, swsusp_header.orig_sig, 10);
+ ret = lseek(fd, 0, SEEK_SET);
+ if (!ret)
+ ret = write(fd, &swsusp_header, PAGE_SIZE);
+ if (ret < (int)PAGE_SIZE) {
+ fprintf(stderr, "resume: Could not restore the partition header\n");
+ error = ret < 0 ? -errno : -EIO;
+ }
+ }
+ fsync(fd);
+ if (!error) {
+ printf("reset_signature: Signature reset ok\n");
+ } else {
+ printf("reset_signature: Error %d resetting the image. Something went very wrong please reboot machine manually, destroy saved image, and force fsck.\n"
+ "\n", error);
+ while(1);
+ }
+ return error;
+}
+
int suspend_system(int snapshot_fd, int resume_fd, int vt_fd, int vt_no)
{
loff_t avail_swap;
@@ -552,7 +601,18 @@
break;
error = write_image(snapshot_fd, resume_fd);
if (!error) {
- power_off();
+ if (!s2ram)
+ power_off();
+ else {
+ //ioctl(snapshot_fd, SNAPSHOT_ENTER_ACPI_STATE, 3);
+#if 1
+ s2ram_do();
+ s2ram_resume();
+ error = EDOM;
+#endif
+ reset_signature(resume_fd);
+ break;
+ }
} else {
free_swap_pages(snapshot_fd);
free_snapshot(snapshot_fd);
@@ -569,6 +629,7 @@
Unfreeze:
unfreeze(snapshot_fd);
+ /* FIXME: We have to kill the signature here */
return error;
}
@@ -779,7 +840,6 @@
if (stat(resume_dev_name, &stat_buf)) {
fprintf(stderr, "suspend: Could not stat the resume device file\n");
return ENODEV;
- } else {
}
if (!S_ISBLK(stat_buf.st_mode)) {
fprintf(stderr, "suspend: Invalid resume device\n");
@@ -797,6 +857,10 @@
ret = ENODEV;
goto Close_resume_fd;
}
+
+ if (s2ram)
+ s2ram_prepare();
+
if (!S_ISCHR(stat_buf.st_mode)) {
fprintf(stderr, "suspend: Invalid snapshot device\n");
ret = EINVAL;
@@ -823,6 +887,7 @@
goto Close_snapshot_fd;
}
+#if 0
sprintf(chroot_path, "/proc/%d", getpid());
if (chroot(chroot_path)) {
fprintf(stderr, "suspend: Could not chroot to %s\n", chroot_path);
@@ -830,6 +895,7 @@
goto Restore_console;
}
chdir("/");
+#endif
orig_loglevel = get_kernel_console_loglevel();
set_kernel_console_loglevel(suspend_loglevel);
Index: swsusp.h
===================================================================
RCS file: /cvsroot/suspend/suspend/swsusp.h,v
retrieving revision 1.14
diff -u -u -r1.14 swsusp.h
--- swsusp.h 12 Mar 2006 16:17:19 -0000 1.14
+++ swsusp.h 15 Mar 2006 00:21:48 -0000
@@ -25,7 +25,8 @@
#define SNAPSHOT_GET_SWAP_PAGE _IOR(SNAPSHOT_IOC_MAGIC, 8, void *)
#define SNAPSHOT_FREE_SWAP_PAGES _IO(SNAPSHOT_IOC_MAGIC, 9)
#define SNAPSHOT_SET_SWAP_FILE _IOW(SNAPSHOT_IOC_MAGIC, 10, unsigned int)
-#define SNAPSHOT_IOC_MAXNR 10
+#define SNAPSHOT_ENTER_ACPI_STATE _IOR(SNAPSHOT_IOC_MAGIC, 11, int)
+#define SNAPSHOT_IOC_MAXNR 11
#define LINUX_REBOOT_MAGIC1 0xfee1dead
#define LINUX_REBOOT_MAGIC2 672274793
Index: whitelist.c
===================================================================
RCS file: /cvsroot/suspend/suspend/whitelist.c,v
retrieving revision 1.17
diff -u -u -r1.17 whitelist.c
--- whitelist.c 8 Mar 2006 20:55:45 -0000 1.17
+++ whitelist.c 15 Mar 2006 00:21:54 -0000
@@ -13,7 +13,7 @@
};
struct machine_entry whitelist[] = {
- { "IBM", "", "ThinkPad X32", "", RADEON_OFF|S3_BIOS|S3_MODE },
+ // { "IBM", "", "ThinkPad X32", "", RADEON_OFF|S3_BIOS|S3_MODE },
{ "Hewlett Packard", "", "HP OmniBook XE3 GF ","", VBE_POST|VBE_SAVE },
{ "Acer ", "Extensa 4150 ", "", "", S3_BIOS|S3_MODE },
{ "Acer ", "TravelMate C300", "", "", VBE_SAVE },
--
76: byte [] Key = new byte[ 16 ];
