From patchwork Thu Jan 20 20:57:16 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rafael Wysocki <rjw@sisk.pl>
X-Patchwork-Id: 492741
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0KKw3Mm009962
	for <patchwork-acpi@patchwork.kernel.org>;
	Thu, 20 Jan 2011 20:58:03 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754687Ab1ATU6C (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Thu, 20 Jan 2011 15:58:02 -0500
Received: from ogre.sisk.pl ([217.79.144.158]:35023 "EHLO ogre.sisk.pl"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754276Ab1ATU6B (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Thu, 20 Jan 2011 15:58:01 -0500
Received: from localhost (localhost.localdomain [127.0.0.1])
	by ogre.sisk.pl (Postfix) with ESMTP id B7EDC1A2A48;
	Thu, 20 Jan 2011 21:42:18 +0100 (CET)
Received: from ogre.sisk.pl ([127.0.0.1])
	by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new,
	port 10024) with ESMTP
	id 24828-07; Thu, 20 Jan 2011 21:41:59 +0100 (CET)
Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by ogre.sisk.pl (Postfix) with ESMTP id A02C81A2993;
	Thu, 20 Jan 2011 21:41:59 +0100 (CET)
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Jeff Chua <jeff.chua.linux@gmail.com>
Subject: Re: [PATCH 0/11] ACPI: Fixes and cleanups related to iomaps
	management
Date: Thu, 20 Jan 2011 21:57:16 +0100
User-Agent: KMail/1.13.5 (Linux/2.6.38-rc1+; KDE/4.4.4; x86_64; ; )
Cc: Len Brown <lenb@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
	"Linux-pm mailing list" <linux-pm@lists.linux-foundation.org>,
	Matthew Garrett <mjg59@srcf.ucam.org>
References: <201101201226.41021.rjw@sisk.pl>
	<AANLkTikVRHfu2KhH4yi2VerkRXBdCODedCDORmpEzRXO@mail.gmail.com>
In-Reply-To: <AANLkTikVRHfu2KhH4yi2VerkRXBdCODedCDORmpEzRXO@mail.gmail.com>
MIME-Version: 1.0
Message-Id: <201101202157.16813.rjw@sisk.pl>
X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Thu, 20 Jan 2011 20:58:03 +0000 (UTC)


Index: linux-2.6/drivers/acpi/nvs.c
===================================================================
--- linux-2.6.orig/drivers/acpi/nvs.c
+++ linux-2.6/drivers/acpi/nvs.c
@@ -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);
 				}
@@ -139,9 +145,17 @@ int suspend_nvs_save(void)
 			if (!entry->kaddr) {
 				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 +178,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);
+		}
 }