===================================================================
@@ -87,9 +87,15 @@ void suspend_nvs_free(void)
entry->data = NULL;
if (entry->kaddr) {
if (entry->unmap) {
+ pr_info("%s: Unmapping %p\n", __func__,
+ entry->kaddr);
+
iounmap(entry->kaddr);
entry->unmap = false;
} else {
+ pr_info("%s: Dropping %p\n", __func__,
+ entry->kaddr);
+
acpi_os_unmap_memory(entry->kaddr,
entry->size);
}
@@ -130,6 +136,8 @@ int suspend_nvs_save(void)
unsigned long phys = page_addr + offset;
unsigned int size = entry->size;
+ pr_info("%s: phys = %lx, size = %d\n", __func__, phys, size);
+
if (!entry->data)
return -ENOMEM;
@@ -137,11 +145,24 @@ int suspend_nvs_save(void)
if (!entry->kaddr) {
entry->kaddr = acpi_os_ioremap(phys, size);
if (!entry->kaddr) {
+
+ pr_info("%s: acpi_os_ioremap() failed\n",
+ __func__);
+
suspend_nvs_free();
return -EIO;
+ } else {
+ pr_info("%s: Mapped %p\n", __func__,
+ entry->kaddr);
}
entry->unmap = true;
+ } else {
+ pr_info("%s: Got address %p\n", __func__, entry->kaddr);
}
+
+ pr_info("%s: Saving %p <- %p\n", __func__,
+ entry->data, entry->kaddr);
+
memcpy(entry->data, entry->kaddr, entry->size);
page_addr += PAGE_SIZE;
@@ -164,6 +185,10 @@ void suspend_nvs_restore(void)
printk(KERN_INFO "PM: Restoring platform NVS memory\n");
list_for_each_entry(entry, &nvs_list, node)
- if (entry->data)
+ if (entry->data) {
+ pr_info("%s: Restoring %p -> %p\n", __func__,
+ entry->data, entry->kaddr);
+
memcpy(entry->kaddr, entry->data, entry->size);
+ }
}