From patchwork Fri Jan 21 00:04:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 493361 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 p0L05KRn012781 for ; Fri, 21 Jan 2011 00:05:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752700Ab1AUAFP (ORCPT ); Thu, 20 Jan 2011 19:05:15 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:35342 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751997Ab1AUAFO (ORCPT ); Thu, 20 Jan 2011 19:05:14 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 4259F1A2C40; Fri, 21 Jan 2011 00:49:45 +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 26260-01; Fri, 21 Jan 2011 00:49:24 +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 CCBBF1A2C49; Fri, 21 Jan 2011 00:49:24 +0100 (CET) From: "Rafael J. Wysocki" To: Jeff Chua Subject: Re: [PATCH 0/11] ACPI: Fixes and cleanups related to iomaps management Date: Fri, 21 Jan 2011 01:04:43 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc1+; KDE/4.4.4; x86_64; ; ) Cc: Len Brown , LKML , ACPI Devel Maling List , "Linux-pm mailing list" , Matthew Garrett References: <201101201226.41021.rjw@sisk.pl> <201101202157.16813.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Message-Id: <201101210104.43641.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: 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]); Fri, 21 Jan 2011 00:05:21 +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); } @@ -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); + } }