From patchwork Wed Apr 4 23:58:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10323629 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 7EC1B601A1 for ; Wed, 4 Apr 2018 23:58:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F5D82904D for ; Wed, 4 Apr 2018 23:58:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 640A42907C; Wed, 4 Apr 2018 23:58:48 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 13F482904D for ; Wed, 4 Apr 2018 23:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752628AbeDDX6q (ORCPT ); Wed, 4 Apr 2018 19:58:46 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:35648 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752661AbeDDX6b (ORCPT ); Wed, 4 Apr 2018 19:58:31 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5CD2560F8F; Wed, 4 Apr 2018 23:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522886311; bh=sDmARAW362c+y0rzcCRTJhP31BAVyP934g39N/iNGFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EZcIQ11Lm7J4kf+dywrf92NZpiuvkuM5r8FsNNNNxsgfQX7zlJdkZoYZXhtnA8D4/ s7elnpcgDb/A99VuDlVdP/YLVCwJ9oEt8bTMKOv3ru7vU4MrGfCG1BfwFHtDAWsb8A 9RJe5R9IlTiROVepRzLcQ/RkiqfBp+Qr1AKMozoU= 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 1133560F6E; Wed, 4 Apr 2018 23:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522886310; bh=sDmARAW362c+y0rzcCRTJhP31BAVyP934g39N/iNGFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l3O/liRZIAO4bWBS7EcMqGejDyvOIT3K5PFxwxwBiUIcgnw47VjjRucKf9iU8kqyL Q835J9RCS5/YBLokHuy1NJmsl4yyupYNrQFIvD1N/bXrSX7J8Jy19pxNtpH6vs7i2f E98Xj2jsvBKRuilzJ8pscKJozlHtXA10plR8T0ok= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1133560F6E 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: arnd@arndb.de, timur@codeaurora.org, sulrich@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/5] io: change inX() to have their own IO barrier overrides Date: Wed, 4 Apr 2018 19:58:20 -0400 Message-Id: <1522886301-25955-5-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522886301-25955-1-git-send-email-okaya@codeaurora.org> References: <1522886301-25955-1-git-send-email-okaya@codeaurora.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Open code readX() inside inX() so that inX() variants have their own overrideable Port IO barrier combinations as __io_pbr() and __io_par() for actions to be taken before port IO and after port IO read. Signed-off-by: Sinan Kaya --- include/asm-generic/io.h | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 38a96d1..da51092 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -432,7 +432,12 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer, #define inb inb static inline u8 inb(unsigned long addr) { - return readb(PCI_IOBASE + addr); + u8 val; + + __io_pbr(); + val = __raw_readb(PCI_IOBASE + addr); + __io_par(); + return val; } #endif @@ -440,7 +445,12 @@ static inline u8 inb(unsigned long addr) #define inw inw static inline u16 inw(unsigned long addr) { - return readw(PCI_IOBASE + addr); + u16 val; + + __io_pbr(); + val = __le16_to_cpu(__raw_readw(PCI_IOBASE + addr)); + __io_par(); + return val; } #endif @@ -448,7 +458,12 @@ static inline u16 inw(unsigned long addr) #define inl inl static inline u32 inl(unsigned long addr) { - return readl(PCI_IOBASE + addr); + u32 val; + + __io_pbr(); + val = __le32_to_cpu(__raw_readl(PCI_IOBASE + addr)); + __io_par(); + return val; } #endif