mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org
Cc: Huang Ying <ying.huang@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 25/50] ACPI, Add 64bit read/write support to atomicio on i386
Date: Tue, 17 Jan 2012 07:21:17 -0500	[thread overview]
Message-ID: <04c25997c97e57d95d1f5a7a6e5fff2411dbd48b.1326802230.git.len.brown@intel.com> (raw)
In-Reply-To: <1326802902-21583-1-git-send-email-lenb@kernel.org>
In-Reply-To: <553575f1ae048aa44682b46b3c51929a0b3ad337.1326802228.git.len.brown@intel.com>

From: Huang Ying <ying.huang@intel.com>

There is no 64bit read/write support in ACPI atomicio because
readq/writeq is used to implement 64bit read/write, but readq/writeq
is not available on i386.  This patch implement 64bit read/write
support in atomicio via two readl/writel.

Signed-off-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/atomicio.c |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c
index cfc0cc1..1016f18 100644
--- a/drivers/acpi/atomicio.c
+++ b/drivers/acpi/atomicio.c
@@ -260,6 +260,21 @@ int acpi_post_unmap_gar(struct acpi_generic_address *reg)
 }
 EXPORT_SYMBOL_GPL(acpi_post_unmap_gar);
 
+#ifdef readq
+static inline u64 read64(const volatile void __iomem *addr)
+{
+	return readq(addr);
+}
+#else
+static inline u64 read64(const volatile void __iomem *addr)
+{
+	u64 l, h;
+	l = readl(addr);
+	h = readl(addr+4);
+	return l | (h << 32);
+}
+#endif
+
 /*
  * Can be used in atomic (including NMI) or process context. RCU read
  * lock can only be released after the IO memory area accessing.
@@ -280,11 +295,9 @@ static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)
 	case 32:
 		*val = readl(addr);
 		break;
-#ifdef readq
 	case 64:
-		*val = readq(addr);
+		*val = read64(addr);
 		break;
-#endif
 	default:
 		return -EINVAL;
 	}
@@ -293,6 +306,19 @@ static int acpi_atomic_read_mem(u64 paddr, u64 *val, u32 width)
 	return 0;
 }
 
+#ifdef writeq
+static inline void write64(u64 val, volatile void __iomem *addr)
+{
+	writeq(val, addr);
+}
+#else
+static inline void write64(u64 val, volatile void __iomem *addr)
+{
+	writel(val, addr);
+	writel(val>>32, addr+4);
+}
+#endif
+
 static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)
 {
 	void __iomem *addr;
@@ -309,11 +335,9 @@ static int acpi_atomic_write_mem(u64 paddr, u64 val, u32 width)
 	case 32:
 		writel(val, addr);
 		break;
-#ifdef writeq
 	case 64:
-		writeq(val, addr);
+		write64(val, addr);
 		break;
-#endif
 	default:
 		return -EINVAL;
 	}
-- 
1.7.9.rc1


  parent reply	other threads:[~2012-01-17 13:22 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-17 12:20 ACPI & Power Management Patches for 3.3 Len Brown
2012-01-17 12:20 ` [PATCH 01/50] tools turbostat: recognize and run properly on IVB Len Brown
2012-01-17 12:20   ` [PATCH 02/50] ACPICA: Put back the call to acpi_os_validate_address Len Brown
2012-01-17 12:20   ` [PATCH 03/50] ACPICA: Update for GCC 4 Len Brown
2012-01-17 12:20   ` [PATCH 04/50] ACPICA: Fix to allow region arguments to reference other scopes Len Brown
2012-03-01 15:27     ` Jonathan Nieder
2012-01-17 12:20   ` [PATCH 05/50] ACPICA: Add error msg for unsupported I/O requests (not 8/16/32 bit length) Len Brown
2012-01-17 12:20   ` [PATCH 06/50] ACPICA: Add error msg for Index/Bank field registers out-of-range Len Brown
2012-01-17 12:20   ` [PATCH 07/50] ACPICA: Do not abort table load on invalid space ID Len Brown
2012-01-17 12:21   ` [PATCH 08/50] ACPI 5.0: Basic support for FADT version 5 Len Brown
2012-01-17 12:21   ` [PATCH 09/50] ACPI 5.0: Implement hardware-reduced option Len Brown
2012-01-17 12:21   ` [PATCH 10/50] ACPI 5.0: Add new/changed tables to headers Len Brown
2012-01-17 12:21   ` [PATCH 11/50] ACPI 5.0: New interfaces to allow driver access to AML mutex objects Len Brown
2012-01-17 12:21   ` [PATCH 12/50] ACPI 5.0: Implement Connection() and AccessAs() changes Len Brown
2012-01-17 12:21   ` [PATCH 13/50] ACPI 5.0: Support for GeneralPurposeIo and GenericSerialBus operation region Len Brown
2012-01-17 12:21   ` [PATCH 14/50] ACPI 5.0: Support for all new resource descriptors Len Brown
2012-01-17 12:21   ` [PATCH 15/50] ACPI 5.0: New interface, acpi_get_event_resources Len Brown
2012-01-17 12:21   ` [PATCH 16/50] ACPI 5.0: New interface, acpi_buffer_to_resource Len Brown
2012-01-17 12:21   ` [PATCH 17/50] ACPI 5.0: Add new predefined names Len Brown
2012-01-17 12:21   ` [PATCH 18/50] ACPI 5.0: Allow _AEI method in walk resources Len Brown
2012-01-17 12:21   ` [PATCH 19/50] ACPICA: Clean up Makefile Len Brown
2012-01-17 12:21   ` [PATCH 20/50] ACPICA: Update to version 20111123 Len Brown
2012-01-17 12:21   ` [PATCH 21/50] ACPICA: Update for larger ACPI 5 FADT size Len Brown
2012-01-17 12:21   ` [PATCH 22/50] ACPICA: Add support for region address conflict checking Len Brown
2012-01-17 12:21   ` [PATCH 23/50] ACPICA: Update all copyrights to 2012 Len Brown
2012-01-17 12:21   ` [PATCH 24/50] ACPICA: Update to version 20120111 Len Brown
2012-01-17 12:21   ` Len Brown [this message]
2012-01-17 12:21   ` [PATCH 26/50] ACPI, APEI, GHES: Add PCIe AER recovery support Len Brown
2012-01-17 12:21   ` [PATCH 27/50] ACPI, APEI, Print resource errors in conventional format Len Brown
2012-01-17 12:21   ` [PATCH 28/50] ACPI, APEI, Remove table not found message Len Brown
2012-01-17 12:21   ` [PATCH 29/50] ACPI, APEI, GHES, Distinguish interleaved error report in kernel log Len Brown
2012-01-17 12:21   ` [PATCH 30/50] ACPI, APEI, Printk queued error record before panic Len Brown
2012-01-17 12:21   ` [PATCH 31/50] ACPI, Add RAM mapping support to ACPI atomic IO support Len Brown
2012-01-17 12:21   ` [PATCH 32/50] ACPI, APEI, EINJ, Fix resource conflict on some machine Len Brown
2012-01-17 12:21   ` [PATCH 33/50] ACPI, APEI, EINJ, Refine the fix of resource conflict Len Brown
2012-01-17 12:21   ` [PATCH 34/50] ACPI, Record ACPI NVS regions Len Brown
2012-01-17 12:21   ` [PATCH 35/50] ACPI, APEI, Resolve false conflict between ACPI NVS and APEI Len Brown
2012-01-17 12:21   ` [PATCH 36/50] ACPI: Store SRAT table revision Len Brown
2012-01-17 12:21   ` [PATCH 37/50] ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64) Len Brown
2012-01-17 12:21   ` [PATCH 38/50] ACPI, ia64: Use SRAT table rev to use 8bit or 16/32bit PXM fields (ia64) Len Brown
2012-01-17 12:21   ` [PATCH 39/50] ACPI: Fix possible alignment issues with GAS 'address' references Len Brown
2012-01-17 12:21   ` [PATCH 40/50] ACPI: Export interfaces for ioremapping/iounmapping ACPI registers Len Brown
2012-01-17 12:21   ` [PATCH 41/50] ACPI APEI: Convert atomicio routines Len Brown
2012-01-17 12:21   ` [PATCH 42/50] acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec Len Brown
2012-01-17 12:21   ` [PATCH 43/50] intel_idle: fix API misuse Len Brown
2012-01-17 12:21   ` [PATCH 44/50] intel_idle: disable auto_demotion for hotplugged CPUs Len Brown
2012-01-17 12:21   ` [PATCH 45/50] intel_idle: remove redundant local_irq_disable() call Len Brown
2012-01-17 12:21   ` [PATCH 46/50] ACPI: kernel-parameters.txt : Add intel_idle.max_cstate Len Brown
2012-01-17 12:21   ` [PATCH 47/50] ACPI: processor: fix acpi_get_cpuid for UP processor Len Brown
2012-01-17 12:21   ` [PATCH 48/50] intel_idle: Fix a cast to pointer from integer of different size warning in intel_idle Len Brown
2012-01-17 12:21   ` [PATCH 49/50] intel idle: Make idle driver more robust Len Brown
2012-01-17 12:21   ` [PATCH 50/50] ACPI processor: Fix error path, also remove sysdev link Len Brown
2012-01-17 22:17 ` ACPI & Power Management Patches for 3.3 Holger Macht

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=04c25997c97e57d95d1f5a7a6e5fff2411dbd48b.1326802230.git.len.brown@intel.com \
    --to=lenb@kernel.org \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=ying.huang@intel.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

all inboxes | Powered by JetHome®