From patchwork Thu Jan 20 11:30:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 491541 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 p0KBcf4c032180 for ; Thu, 20 Jan 2011 11:39:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755553Ab1ATLi4 (ORCPT ); Thu, 20 Jan 2011 06:38:56 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:60055 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755535Ab1ATLiy (ORCPT ); Thu, 20 Jan 2011 06:38:54 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id BD0831A28DA; Thu, 20 Jan 2011 12:23:34 +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 19658-03; Thu, 20 Jan 2011 12:23:16 +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 ABAEB1A2A48; Thu, 20 Jan 2011 12:22:54 +0100 (CET) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 3/11] ACPI: Fix acpi_os_read_memory() and acpi_os_write_memory() Date: Thu, 20 Jan 2011 12:30:09 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.38-rc1+; KDE/4.4.4; x86_64; ; ) Cc: Jeff Chua , LKML , ACPI Devel Maling List , "Linux-pm mailing list" , Matthew Garrett References: <201101201226.41021.rjw@sisk.pl> In-Reply-To: <201101201226.41021.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201101201230.10048.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]); Thu, 20 Jan 2011 11:39:05 +0000 (UTC) Index: linux-2.6/drivers/acpi/osl.c =================================================================== --- linux-2.6.orig/drivers/acpi/osl.c +++ linux-2.6/drivers/acpi/osl.c @@ -638,17 +638,17 @@ acpi_os_read_memory(acpi_physical_addres { u32 dummy; void __iomem *virt_addr; - int size = width / 8, unmap = 0; + + if (!value) + value = &dummy; rcu_read_lock(); - virt_addr = acpi_map_vaddr_lookup(phys_addr, size); - rcu_read_unlock(); + virt_addr = acpi_map_vaddr_lookup(phys_addr, width / 8); if (!virt_addr) { - virt_addr = acpi_os_ioremap(phys_addr, size); - unmap = 1; + rcu_read_unlock(); + WARN(true, "Address not mapped: %llx\n", phys_addr); + return AE_BAD_ADDRESS; } - if (!value) - value = &dummy; switch (width) { case 8: @@ -663,9 +663,7 @@ acpi_os_read_memory(acpi_physical_addres default: BUG(); } - - if (unmap) - iounmap(virt_addr); + rcu_read_unlock(); return AE_OK; } @@ -674,14 +672,13 @@ acpi_status acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width) { void __iomem *virt_addr; - int size = width / 8, unmap = 0; rcu_read_lock(); - virt_addr = acpi_map_vaddr_lookup(phys_addr, size); - rcu_read_unlock(); + virt_addr = acpi_map_vaddr_lookup(phys_addr, width / 8); if (!virt_addr) { - virt_addr = acpi_os_ioremap(phys_addr, size); - unmap = 1; + rcu_read_unlock(); + WARN(true, "Address not mapped: %llx\n", phys_addr); + return AE_BAD_ADDRESS; } switch (width) { @@ -697,9 +694,7 @@ acpi_os_write_memory(acpi_physical_addre default: BUG(); } - - if (unmap) - iounmap(virt_addr); + rcu_read_unlock(); return AE_OK; }