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: 10343971 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 86F8C601C2 for ; Mon, 16 Apr 2018 22:01:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74D562891E for ; Mon, 16 Apr 2018 22:01:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6923A28923; Mon, 16 Apr 2018 22:01:52 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B6DF42891E for ; Mon, 16 Apr 2018 22:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UX8UtOlxbuKVMEEtClg3MljtnpdXSnaaLLD6yNt3EAs=; b=Kkx8kV5k/ZuXgN NdKaHuc9hxjRq4FJ85y1uzu3/WuM38bGyPy6zDAopCc71yh07KtR4Rjyhwkx1Kl5j3G0+38uy0SGF ZEdSU3ZqfvHqRUY/fjx0hwgdWn3qW3I58vGg342EHAKttz03Oq9Q1KPt5dSuDESXeoKRcjnTSzh2n mVkS2Bak0DVyWEqoVM2oI6jUNf8qwLPOO/0LR1dI2GSpzJd7vH2bZhu/XFKkY7iUh80L6Qn+1Vi1+ stUtjBOBj30K5zr82MKGCr3v5zk+9MF8/1Gh8AqArJXtbsrim8sSWSs5H9PbbGmlQqEUWIzaLY1nV IWfQRSGxPMmIKS7OBckg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8CBw-00086I-Of; Mon, 16 Apr 2018 22:01:40 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8CBs-00085G-M2 for linux-arm-kernel@lists.infradead.org; Mon, 16 Apr 2018 22:01:38 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id BEFCF607E1; 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=1523916088; bh=5AOWhSnIOvGZDvvLBfLJ6xunR3eK7LSXOKDi5ntoVD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n0uOyPcznsxzUKYmzdoPC7qwcIrDjoFkcU7iL1iapDgV7dVIf9xA2UxAru30jHAah HAEG+AlAFLF/wsEfwtAkGzvXLpYEvkvU33iKUEV57vs7nS7dt76VjYkEKQn+Frstpr XpZHDDHbYMBMdLd50Cb0tgOpOxZb1FKzxD7OFCxk= 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180416_150136_900535_49D0F137 X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kate Stewart , linux-parisc@vger.kernel.org, Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, Helge Deller , "James E.J. Bottomley" , linux-kernel@vger.kernel.org, Sinan Kaya , Philippe Ombredanne , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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);