From patchwork Wed Sep 24 17:17:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 37860 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 12B1E202FD for ; Wed, 24 Sep 2014 17:24:17 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id ho1sf3833550wib.0 for ; Wed, 24 Sep 2014 10:24:17 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=zW8nRF0oLLe9ESoB6Bmvqnow+aWMVWqgFuDZw49cgGQ=; b=lBrvh3adpaXwPT9DXjLhC1xMJ9hI1KB2NAUTfskIzdiuMHQ4EKHcxyldAreISSLOpT uz9R/uSB/Z0xcH3VCV2BsubCGKwacYnbIjs4jw8GdFLbF8EWjvH2aQ+PHwVy0Pe7eFPy 4Tm8FYAkEGwtH30j04VoczYSdXAALtb/JZEQw28gVmdNVOwSMpWnY2RCvSezD+sRmkHG WlPqH2WJYdK1VywYB5JUu61vPX6Zo+R3+UoMxN7mzOKLkHdnfeQmnSFFYrT/F+0CsUhx PqieLeGLvBpFOj6JsCpFrfMgM2CQBH2/wpen/aIzXpycC9rNKYQhxWCRlsbhKfQExqjU SH9A== X-Gm-Message-State: ALoCoQkn3zh8h3R796anOjcn90tr6lmRIiDYsqEIlzAohIdVgUj+p7pKTYR4Q9714qz905skcQBI X-Received: by 10.180.24.225 with SMTP id x1mr4295541wif.2.1411579457294; Wed, 24 Sep 2014 10:24:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.39 with SMTP id y7ls194727lag.0.gmail; Wed, 24 Sep 2014 10:24:17 -0700 (PDT) X-Received: by 10.112.168.38 with SMTP id zt6mr7362209lbb.60.1411579457081; Wed, 24 Sep 2014 10:24:17 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by mx.google.com with ESMTPS id t9si23633729lae.103.2014.09.24.10.24.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 10:24:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by mail-la0-f41.google.com with SMTP id s18so11158459lam.14 for ; Wed, 24 Sep 2014 10:24:17 -0700 (PDT) X-Received: by 10.112.75.233 with SMTP id f9mr4277310lbw.102.1411579457012; Wed, 24 Sep 2014 10:24:17 -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.130.169 with SMTP id of9csp621681lbb; Wed, 24 Sep 2014 10:24:16 -0700 (PDT) X-Received: by 10.68.182.98 with SMTP id ed2mr10921359pbc.95.1411579455516; Wed, 24 Sep 2014 10:24:15 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rn15si27324081pab.76.2014.09.24.10.24.14 for ; Wed, 24 Sep 2014 10:24:15 -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 S1754780AbaIXRYL (ORCPT + 27 others); Wed, 24 Sep 2014 13:24:11 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:41661 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753841AbaIXRUh (ORCPT ); Wed, 24 Sep 2014 13:20:37 -0400 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.204]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s8OHIswo025697; Wed, 24 Sep 2014 18:18:54 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 69A8B1AE11D4; Wed, 24 Sep 2014 18:18:57 +0100 (BST) From: Will Deacon To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, benh@kernel.crashing.org, chris@zankel.net, cmetcalf@tilera.com, davem@davemloft.net, deller@gmx.de, dhowells@redhat.com, geert@linux-m68k.org, heiko.carstens@de.ibm.com, hpa@zytor.com, jcmvbkbc@gmail.com, jesper.nilsson@axis.com, mingo@redhat.com, monstr@monstr.eu, paulmck@linux.vnet.ibm.com, rdunlap@infradead.org, sam@ravnborg.org, schwidefsky@de.ibm.com, starvik@axis.com, takata@linux-m32r.org, tglx@linutronix.de, tony.luck@intel.com, daniel.thompson@linaro.org, broonie@linaro.org, linux@arm.linux.org.uk, Will Deacon Subject: [PATCH v3 09/17] m68k: io: implement dummy relaxed accessor macros for writes Date: Wed, 24 Sep 2014 18:17:28 +0100 Message-Id: <1411579056-16966-10-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411579056-16966-1-git-send-email-will.deacon@arm.com> References: <1411579056-16966-1-git-send-email-will.deacon@arm.com> 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: will.deacon@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 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: , write{b,w,l}_relaxed are implemented by some architectures in order to permit memory-mapped I/O accesses with weaker barrier semantics than the non-relaxed variants. This patch adds dummy macros for the write accessors to m68k, in the same vein as the dummy definitions for the relaxed read accessors. Additionally, the existing relaxed read accessors are moved into asm/io.h, so that they can be used by m68k targets with an MMU. Acked-by: Geert Uytterhoeven Signed-off-by: Will Deacon --- arch/m68k/include/asm/io.h | 8 ++++++++ arch/m68k/include/asm/io_no.h | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index c70cc9155003..bccd5a914eb6 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -3,3 +3,11 @@ #else #include #endif + +#define readb_relaxed(addr) readb(addr) +#define readw_relaxed(addr) readw(addr) +#define readl_relaxed(addr) readl(addr) + +#define writeb_relaxed(b, addr) writeb(b, addr) +#define writew_relaxed(b, addr) writew(b, addr) +#define writel_relaxed(b, addr) writel(b, addr) diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 52f7e8499172..19c237c63dc2 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h @@ -40,10 +40,6 @@ static inline unsigned int _swapl(volatile unsigned long v) #define readl(addr) \ ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; }) -#define readb_relaxed(addr) readb(addr) -#define readw_relaxed(addr) readw(addr) -#define readl_relaxed(addr) readl(addr) - #define writeb(b,addr) (void)((*(volatile unsigned char *) (addr)) = (b)) #define writew(b,addr) (void)((*(volatile unsigned short *) (addr)) = (b)) #define writel(b,addr) (void)((*(volatile unsigned int *) (addr)) = (b))