From patchwork Wed Oct 22 16:06:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 39320 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 292F120341 for ; Wed, 22 Oct 2014 16:06:45 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id n3sf580058wiv.5 for ; Wed, 22 Oct 2014 09:06:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=jq4YbMCr9qi0WN2piD/ZWpPersJs8cWHqtS1RYHJ+oA=; b=SGc6lDK8Ym9AsFkdLJNVKb7Vwk8M9Huu58EETYIlJyWQPwvUPv3a4hfvPua0rLeYph nPYocEvIF7jZCzbvBq8htdz+n1tzRFKXjJ9JLit5cw1T8ckj7ESBEsXz5ymiMubvhzEs hPe99AV0VvNfFLcPYxgLsNFUJzQ/AkWH3folll3/HcWqrh+hPIYdlTP09L133XXysvNa BTIXd05+jEqnzH0evd/TO2xvtXhfWGfz+/BIgiI9xPzoUVm/k3RBDaaV+3pTq/0Ez+4s 1KXLNDYv6Gh1VUDzQOFZ0a7Y9CVdwt3ZkCaxLb1rTGn2ZmTWW9cIq1oaCVMf06aDinQx 2oUQ== X-Gm-Message-State: ALoCoQlMn3eu3SX8O0p3eVtoDutqQrmtrqzqKU2kmVV5uWx434+0rxFAhFHAMODZi8xnemPpT9gI X-Received: by 10.152.25.202 with SMTP id e10mr6711643lag.2.1413994004037; Wed, 22 Oct 2014 09:06:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.131 with SMTP id w3ls235413lad.79.gmail; Wed, 22 Oct 2014 09:06:43 -0700 (PDT) X-Received: by 10.112.141.104 with SMTP id rn8mr11517966lbb.87.1413994003870; Wed, 22 Oct 2014 09:06:43 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id p9si23566676lal.21.2014.10.22.09.06.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Oct 2014 09:06:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id z12so3135317lbi.2 for ; Wed, 22 Oct 2014 09:06:43 -0700 (PDT) X-Received: by 10.112.130.41 with SMTP id ob9mr41823462lbb.74.1413994003175; Wed, 22 Oct 2014 09:06:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp103652lbz; Wed, 22 Oct 2014 09:06:42 -0700 (PDT) X-Received: by 10.66.121.103 with SMTP id lj7mr43752323pab.84.1413994001551; Wed, 22 Oct 2014 09:06:41 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mm5si14472279pbc.212.2014.10.22.09.06.40 for ; Wed, 22 Oct 2014 09:06:41 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932663AbaJVQGg (ORCPT + 27 others); Wed, 22 Oct 2014 12:06:36 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:64375 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755362AbaJVQGd (ORCPT ); Wed, 22 Oct 2014 12:06:33 -0400 Received: by mail-pd0-f170.google.com with SMTP id z10so3811254pdj.1 for ; Wed, 22 Oct 2014 09:06:33 -0700 (PDT) X-Received: by 10.66.121.103 with SMTP id lj7mr43751501pab.84.1413993993349; Wed, 22 Oct 2014 09:06:33 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPSA id y16sm14567644pbt.17.2014.10.22.09.06.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Oct 2014 09:06:32 -0700 (PDT) From: mathieu.poirier@linaro.org To: linux@arm.linux.org.uk Cc: catalin.marinas@arm.com, stefano.stabellini@eu.citrix.com, ezequiel.garcia@free-electrons.com, Liviu.Dudau@arm.com, thomas.petazzoni@free-electrons.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH] ARM: supplementing IO accessors with 64 bit capability Date: Wed, 22 Oct 2014 10:06:23 -0600 Message-Id: <1413993983-17310-1-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mathieu.poirier@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Mathieu Poirier Some drivers on ARMv7 need 64 bit read and writes. Signed-off-by: Mathieu Poirier --- arch/arm/include/asm/io.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 1805674..861e52c 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -118,6 +118,24 @@ static inline u32 __raw_readl(const volatile void __iomem *addr) return val; } +#if __LINUX_ARM_ARCH__ >= 5 +static inline void __raw_writeq(u64 val, volatile void __iomem *addr) +{ + asm volatile("strd %1, %0" + : "+Qo" (*(volatile u64 __force *)addr) + : "r" (val)); +} + +static inline u64 __raw_readq(const volatile void __iomem *addr) +{ + u64 val; + asm volatile("ldrd %1, %0" + : "+Qo" (*(volatile u64 __force *)addr), + "=r" (val)); + return val; +} +#endif + /* * Architecture ioremap implementation. */ @@ -306,10 +324,13 @@ extern void _memset_io(volatile void __iomem *, int, size_t); __raw_readw(c)); __r; }) #define readl_relaxed(c) ({ u32 __r = le32_to_cpu((__force __le32) \ __raw_readl(c)); __r; }) +#define readq_relaxed(c) ({ u64 __r = le64_to_cpu((__force __le64) \ + __raw_readq(c)); __r; }) #define writeb_relaxed(v,c) __raw_writeb(v,c) #define writew_relaxed(v,c) __raw_writew((__force u16) cpu_to_le16(v),c) #define writel_relaxed(v,c) __raw_writel((__force u32) cpu_to_le32(v),c) +#define writeq_relaxed(v,c) __raw_writeq((__force u64) cpu_to_le64(v),c) #define readb(c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) #define readw(c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; })