Fix issues during capsule restoring

Author: daniel-rossier

linux/linux/soo/include/soo/uapi/soo.h

@@ -461,15 +461,10 @@ typedef struct {
 /* AVZ_WRITE_SNAPSHOT */
 typedef struct {
 	void *snapshot_paddr;
-	uint32_t slotID;
+	int32_t slotID;
         int size;
 } avz_snapshot_t;
 
-/* AVZ_MIG_FINAL */
-typedef struct {
-        uint32_t slotID;
-} avz_mig_final_t;
-
 /* AVZ_KILL_ME */
 typedef struct {
         uint32_t slotID;
@@ -505,7 +500,6 @@ typedef struct {
                 avz_free_slot_t avz_free_slot_args;
                 avz_mig_init_t avz_mig_init_args;
                 avz_snapshot_t avz_snapshot_args;
-                avz_mig_final_t avz_mig_final_args;
                 avz_kill_me_t avz_kill_me_args;
                 avz_console_io_t avz_console_io_args;
                 avz_domctl_t avz_domctl_args;

linux/linux/soo/kernel/injector.c

@@ -16,7 +16,7 @@
  *
  */
 
-#if 0
+#if 1
 #define DEBUG
 #endif
 
@@ -161,6 +161,9 @@ void read_snapshot(uint32_t slotID, void *buffer, uint32_t *size) {
 
         /* Ask the size only */
         if (*size == 0) {
+
+                DBG("%s: ask the snapshot size...\n", __func__);
+
                 args.cmd = AVZ_ME_READ_SNAPSHOT;
                 args.u.avz_snapshot_args.slotID = slotID;
                 args.u.avz_snapshot_args.size = 0;
@@ -214,7 +217,6 @@ void read_snapshot(uint32_t slotID, void *buffer, uint32_t *size) {
 
         if (ME_state == ME_state_resuming) {
 
-                DBG0("SOO migration subsys: Entering post migration tasks...\n");
                 DBG("Pinging ME %d for DC_RESUME...\n", slotID);
                 do_sync_dom(slotID, DC_RESUME);
 
@@ -248,18 +250,6 @@ int write_snapshot(void *buffer) {
 
         snapshot_size = *((uint32_t *) buffer);
 
-        args.cmd = AVZ_ME_WRITE_SNAPSHOT;
-
-        args.u.avz_snapshot_args.size = snapshot_size;
-        args.u.avz_snapshot_args.slotID = 0;
-
-        avz_hypercall(&args);
-
-        if (!args.u.avz_snapshot_args.slotID)
-                return -1; /* No free space */
-
-        slotID = args.u.avz_snapshot_args.slotID;
-
         ret = misc_register(&cma_malloc_miscdevice);
 
         dev = cma_malloc_miscdevice.this_device;
@@ -277,11 +267,22 @@ int write_snapshot(void *buffer) {
         BUG_ON(ret);
 
         args.cmd = AVZ_ME_WRITE_SNAPSHOT;
-
+     
+        args.u.avz_snapshot_args.size = snapshot_size;
+        args.u.avz_snapshot_args.slotID = -1;
         args.u.avz_snapshot_args.snapshot_paddr = (void *) dma_handle;
 
+        DBG("%s: Now asking AVZ to re-implement the snapshot of size %d bytes...\n", __func__, snapshot_size);
+
         avz_hypercall(&args);
 
+        if (!args.u.avz_snapshot_args.slotID) {
+                printk("%s: No free space...\n", __func__);
+                return -1; /* No free space */
+        }
+
+        slotID = args.u.avz_snapshot_args.slotID;
+
         dma_free_coherent(dev, snapshot_size, me, dma_handle);
         misc_deregister(&cma_malloc_miscdevice);
 

linux/linux/soo/kernel/vbus/vbus.c

@@ -770,7 +770,7 @@ static irqreturn_t directcomm_isr(int irq, void *args) {
 	case DC_PRE_SUSPEND:
 	case DC_SUSPEND:
 	case DC_RESUME:
-	case DC_FORCE_TERMINATE:
+	case DC_SHUTDOWN:
 	case DC_POST_ACTIVATE:
 	case DC_TRIGGER_DEV_PROBE:
 	case DC_TRIGGER_LOCAL_COOPERATION:

linux/usr/apps/restoreme.c

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
 	zip = zip_open(argv[1], 0, 'r');
 
 	if (!zip) {
-                printf("Failed to open the zip file. Is there a bad sync after saving the snapshot?...");
+                printf("Failed to open the zip file. Is there a bad sync after saving the snapshot?...\n");
                 return EXIT_FAILURE;
 	}
 
@@ -63,8 +63,9 @@ int main(int argc, char *argv[]) {
 
 	zip_close(zip);
 
-	printf("  ** ME memory re-implantation and resuming...\n");
+	printf("  ** ME memory re-implantation and resuming the capsule.\n");
 
+	args.slotID = -1;
 	ioctl(fd_core, AGENCY_IOCTL_WRITE_SNAPSHOT, &args);
 
 	close(fd_core);

linux/usr/include/soo/uapi/soo.h

@@ -84,7 +84,7 @@ typedef struct {
 
 #define AGENCY_IOCTL_READ_SNAPSHOT		_IOWR('S', 1, agency_ioctl_args_t)
 #define AGENCY_IOCTL_WRITE_SNAPSHOT		_IOW('S', 2, agency_ioctl_args_t)
-#define AGENCY_IOCTL_SHUTDOWN			_IOW('S', 3, agency_ioctl_args_t)
+#define AGENCY_IOCTL_SHUTDOWN   		_IOW('S', 3, agency_ioctl_args_t)
 #define AGENCY_IOCTL_INJECT_CAPSULE     	_IOWR('S', 4, agency_ioctl_args_t)
 #define AGENCY_IOCTL_START_CAPSULE              _IOWR('S', 5, agency_ioctl_args_t)
 #define AGENCY_IOCTL_GET_ME_ID			_IOWR('S', 6, agency_ioctl_args_t)