From patchwork Mon Apr 16 22:01:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10343967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EBB17601C2 for ; Mon, 16 Apr 2018 22:01:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8CD32891E for ; Mon, 16 Apr 2018 22:01:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD36A28923; Mon, 16 Apr 2018 22:01:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 816322891E for ; Mon, 16 Apr 2018 22:01:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752609AbeDPWBc (ORCPT ); Mon, 16 Apr 2018 18:01:32 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:45574 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753130AbeDPWBa (ORCPT ); Mon, 16 Apr 2018 18:01:30 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4A36760FF7; Mon, 16 Apr 2018 22:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523916089; bh=5AOWhSnIOvGZDvvLBfLJ6xunR3eK7LSXOKDi5ntoVD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NWtPmEyGdJfqsl1y9h2QrQyKiOf8hmit7in6JFqvBrk6KirSlQ7jREHnvaXk95qyg 7TosxLXdoMp3YvfSJSXSLhwIXY5XyPaVH1b5XSw3iwRwN94q1Dagb/r7SMXA8vGfAc kwYjzQtDWmZTGfSA8sjSDbl04R/BhRa5qiNyjm64= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id A1F816081C; Mon, 16 Apr 2018 22:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523916088; bh=5AOWhSnIOvGZDvvLBfLJ6xunR3eK7LSXOKDi5ntoVD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n0uOyPcznsxzUKYmzdoPC7qwcIrDjoFkcU7iL1iapDgV7dVIf9xA2UxAru30jHAah HAEG+AlAFLF/wsEfwtAkGzvXLpYEvkvU33iKUEV57vs7nS7dt76VjYkEKQn+Frstpr XpZHDDHbYMBMdLd50Cb0tgOpOxZb1FKzxD7OFCxk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A1F816081C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: linux-parisc@linux-mips.org, arnd@arndb.de, timur@codeaurora.org, sulrich@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , "James E.J. Bottomley" , Helge Deller , Philippe Ombredanne , Thomas Gleixner , Kate Stewart , Greg Kroah-Hartman , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] parisc: use the asm-generic version for readX() Date: Mon, 16 Apr 2018 18:01:16 -0400 Message-Id: <1523916078-23049-2-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523916078-23049-1-git-send-email-okaya@codeaurora.org> References: <1523916078-23049-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP parisc architecture seems to be mapping readX() and readX_relaxed() APIs to __raw_readX() API. __raw_readX() API doesn't provide any kind of ordering guarantees. commit 032d59e1cde9 ("io: define stronger ordering for the default readX() implementation") changed asm-generic implementation to use a more conservative approach towards the readX() API. Drop the arch specific version and rely on the asm-generic version for parisc since it doesn't seem to do anything special with these macros. Signed-off-by: Sinan Kaya --- arch/parisc/include/asm/io.h | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index ef04864..7e60642 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h @@ -177,31 +177,6 @@ static inline void __raw_writeq(unsigned long long b, volatile void __iomem *add *(volatile unsigned long long __force *) addr = b; } -static inline unsigned char readb(const volatile void __iomem *addr) -{ - return __raw_readb(addr); -} -static inline unsigned short readw(const volatile void __iomem *addr) -{ - return le16_to_cpu((__le16 __force) __raw_readw(addr)); -} -static inline unsigned int readl(const volatile void __iomem *addr) -{ - return le32_to_cpu((__le32 __force) __raw_readl(addr)); -} -static inline unsigned long long readq(const volatile void __iomem *addr) -{ - return le64_to_cpu((__le64 __force) __raw_readq(addr)); -} - -#define readb readb -#define readw readw -#define readl readl -#define readq readq -#define readb_relaxed(addr) readb(addr) -#define readw_relaxed(addr) readw(addr) -#define readl_relaxed(addr) readl(addr) -#define readq_relaxed(addr) readq(addr) #define mmiowb() do { } while (0) void memset_io(volatile void __iomem *addr, unsigned char val, int count);