linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org
Cc: Myron Stowe <myron.stowe@hp.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 55/60] ACPI: Fix ioremap size for MMIO reads and writes
Date: Mon, 25 Oct 2010 02:21:03 -0400	[thread overview]
Message-ID: <b3ba1efec2a58f4dc0647f4c0099c27d6ab92595.1287987547.git.len.brown@intel.com> (raw)
In-Reply-To: <1287987668-17584-1-git-send-email-lenb@kernel.org>
In-Reply-To: <a210080195c95ebca2a517ee3057d71607aa65e0.1287987547.git.len.brown@intel.com>

From: Myron Stowe <myron.stowe@hp.com>

The size used for I/O remapping MMIO read and write accesses has not
accounted for the basis of ACPI's Generic Address Structure (GAS)
'Register Bit Width' field which is bits, not bytes.  This patch
adjusts the ioremap() 'size' argument accordingly.

ACPI "Generic Register" reference:
  ACPI Specification, Revision 4.0, Section 5.2.3.1, "Generic Address
  Structure".

Signed-off-by: Myron Stowe <myron.stowe@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/osl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 65b25a3..58842fb 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -496,7 +496,7 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
 	u32 dummy;
 	void __iomem *virt_addr;
 
-	virt_addr = ioremap(phys_addr, width);
+	virt_addr = ioremap(phys_addr, width / 8);
 	if (!value)
 		value = &dummy;
 
@@ -524,7 +524,7 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 {
 	void __iomem *virt_addr;
 
-	virt_addr = ioremap(phys_addr, width);
+	virt_addr = ioremap(phys_addr, width / 8);
 
 	switch (width) {
 	case 8:
-- 
1.7.3.2.90.gd4c43


  parent reply	other threads:[~2010-10-25  7:11 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-25  6:20 ACPI patches for 2.6.37-merge Len Brown
2010-10-25  6:20 ` [PATCH 01/60] ACPI / ACPICA: Defer enabling of runtime GPEs (v3) Len Brown
2010-10-25  6:20   ` [PATCH 02/60] ACPICA: Fix acpi_os_read_pci_configuration prototype Len Brown
2010-10-25  6:20   ` [PATCH 03/60] ACPICA: Revert "Revert "Enable multi-byte EC transfers Len Brown
2010-10-25  6:20   ` [PATCH 04/60] ACPICA/ACPI: Add new host interfaces for _OSI support Len Brown
2010-10-25  6:20   ` [PATCH 05/60] ACPICA: Update version to 20100806 Len Brown
2010-10-25  6:20   ` [PATCH 06/60] ACPICA: Obsolete the acpi_os_derive_pci_id OSL interface Len Brown
2010-10-25  6:20   ` [PATCH 07/60] ACPICA: Add ACPI_INLINE configuration parameter Len Brown
2010-10-25  6:20   ` [PATCH 08/60] ACPICA: Make acpi_thread_id no longer configurable, always u64 Len Brown
2010-10-25  6:20   ` [PATCH 09/60] ACPICA: Update math module; no functional change Len Brown
2010-10-25  6:20   ` [PATCH 10/60] ACPICA: Make acpi_gbl_system_awake_and_running publically available Len Brown
2010-10-25  6:20   ` [PATCH 11/60] ACPICA: iASL/Disassembler: Write ACPI errors to stderr instead of output file Len Brown
2010-10-25  6:20   ` [PATCH 12/60] ACPICA: Add repair for _HID and _CID strings Len Brown
2010-10-25  6:20   ` [PATCH 13/60] ACPICA: Increase configurability of error messages Len Brown
2010-10-25  6:20   ` [PATCH 14/60] ACPICA: Update version to 20100915 Len Brown
2010-10-25  6:20   ` [PATCH 15/60] PNP: log PNP resources, as we do for PCI Len Brown
2010-10-25  6:20   ` [PATCH 16/60] PNPACPI: cope with invalid device IDs Len Brown
2010-10-25  6:20   ` [PATCH 17/60] ACPI: Remove unused #define ACPI_PROCESSOR_FILE_POWER Len Brown
2010-10-25  6:20   ` [PATCH 18/60] ACPI: Do not export hid/modalias sysfs file for ACPI objects without a HID Len Brown
2010-10-25  6:20   ` [PATCH 19/60] ACPI/PNP: A HID value of an object never changes -> make it const Len Brown
2010-10-25  6:20   ` [PATCH 20/60] acpi-cpufreq: fix a memleak when unloading driver Len Brown
2010-10-25  6:20   ` [PATCH 21/60] ACPI / PM: Fix problems with acpi_pm_device_sleep_state() Len Brown
2010-10-25  6:20   ` [PATCH 22/60] ACPI: add FW_BUG to OSI(Linux) message Len Brown
2010-10-25  6:20   ` [PATCH 23/60] ACPI ac/battery/sbs: sysfs I/F always built in, procfs I/F disabled by default Len Brown
2010-10-25  6:20   ` [PATCH 24/60] ACPI fan: remove deprecated procfs I/F Len Brown
2010-10-25  6:20   ` [PATCH 25/60] ACPI thermal: " Len Brown
2010-10-25  6:20   ` [PATCH 26/60] ACPI video: " Len Brown
2010-10-25  6:20   ` [PATCH 27/60] ACPI processor: make /proc/acpi/processor/*/throttle depends on CONFIG_ACPI_PROCFS Len Brown
2010-10-25  6:20   ` [PATCH 28/60] ACPI: remove unused declaration of proc_fs.h Len Brown
2010-10-25  6:20   ` [PATCH 29/60] ACPICA: Comment update; no functional change Len Brown
2010-10-25  6:20   ` [PATCH 30/60] ACPICA: Change type of _TZ from ThermalZone to Device Len Brown
2010-10-25  6:20   ` [PATCH 31/60] ACPICA: Eliminate duplicate code in acpi_ut_execute_* functions Len Brown
2010-10-25  6:20   ` [PATCH 32/60] ACPICA: Add Vista SP2 to supported _OSI strings Len Brown
2010-10-25  6:20   ` [PATCH 33/60] ACPICA: Clear PCIEXP_WAKE_STS when clearing ACPI events Len Brown
2010-10-25  6:20   ` [PATCH 34/60] ACPICA: Update version to 20101013 Len Brown
2010-10-25  6:20   ` [PATCH 35/60] ACPI: Only processor needs CPU_IDLE Len Brown
2010-10-25  6:20   ` [PATCH 36/60] ACPI: delete dedicated MAINTAINERS entries for ACPI EC and BATTERY drivers Len Brown
2010-10-25  6:20   ` [PATCH 37/60] ACPI: remove dead code Len Brown
2010-10-25  6:20   ` [PATCH 38/60] ACPI: static sleep_states[] and acpi_gts_bfs_check Len Brown
2010-10-25  6:20   ` [PATCH 39/60] ACPI: thermal: remove unused limit code Len Brown
2010-10-25  6:20   ` [PATCH 40/60] ACPI dock: move some functions to .init.text Len Brown
2010-10-25  6:20   ` [PATCH 41/60] ACPI: Make Embedded Controller command timeout delay configurable Len Brown
2010-10-25  6:20   ` [PATCH 42/60] ACPI battery: support percentage battery remaining capacity Len Brown
2010-10-25  6:20   ` [PATCH 43/60] Subject: [PATCH] ACPICA: Fix Scope() op in module level code Len Brown
2010-10-25  6:20   ` [PATCH 44/60] ACPI, APEI, Add ERST record ID cache Len Brown
2010-10-25  8:56     ` Ingo Molnar
2010-10-25  6:20   ` [PATCH 45/60] Add lock-less version of bitmap_set/clear Len Brown
2010-10-25  6:20   ` [PATCH 46/60] lock-less NULL terminated single list implementation Len Brown
2010-10-25  6:20   ` [PATCH 47/60] lock-less general memory allocator Len Brown
2010-10-25  6:20   ` [PATCH 48/60] Hardware error device core Len Brown
2010-10-25  6:20   ` [PATCH 49/60] Hardware error record persistent support Len Brown
2010-10-25  6:20   ` [PATCH 50/60] ACPI, APEI, Use ERST for hardware error persisting before panic Len Brown
2010-10-25  6:20   ` [PATCH 51/60] ACPI, APEI, Report GHES error record with hardware error device core Len Brown
2010-10-25  6:21   ` [PATCH 52/60] ACPI, APEI, Generic Hardware Error Source POLL/IRQ/NMI notification type support Len Brown
2010-10-25  6:21   ` [PATCH 53/60] ACPI / PM: Fix reference counting of power resources Len Brown
2010-10-25  6:21   ` [PATCH 54/60] ACPI / Battery: Return -ENODEV for unknown values in get_property() Len Brown
2010-10-25  6:21   ` Len Brown [this message]
2010-10-25  6:21   ` [PATCH 56/60] ACPI: Maintain a list of ACPI memory mapped I/O remappings Len Brown
2010-10-25  6:21   ` [PATCH 57/60] ACPI: Add interfaces for ioremapping/iounmapping ACPI registers Len Brown
2010-10-25  6:21   ` [PATCH 58/60] ACPI: Pre-map 'system event' related register blocks Len Brown
2010-10-25  6:21   ` [PATCH 59/60] ACPI: Convert simple locking to RCU based locking Len Brown
2010-10-25  6:21   ` [PATCH 60/60] ACPI: Page based coalescing of I/O remappings optimization Len Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b3ba1efec2a58f4dc0647f4c0099c27d6ab92595.1287987547.git.len.brown@intel.com \
    --to=lenb@kernel.org \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=myron.stowe@hp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).