From patchwork Thu Apr 5 13:09:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10324551 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 11BCF6053F for ; Thu, 5 Apr 2018 13:09:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0263A291B0 for ; Thu, 5 Apr 2018 13:09:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9D6F291BA; Thu, 5 Apr 2018 13:09:43 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 CF07728F65 for ; Thu, 5 Apr 2018 13:09:42 +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=0YWLOk1dbHJFgLkFfxCpGsuk1K0PknuXslwiOJbcpl0=; b=Q5iQ6vpoW1321b dOmS3glSFafyh1EwhWkkLcMOm5Vz91fH6nntATHGmLN46qxDD8qUT3BUhikY0zxS2YqR9WTEA1NCN NIcxVJS9/cl62JR/ghSr4oW1Qx/m/C42M3IbCbUC3YIUOWzsMuoDCf4KumhC/Ae3iSyBlefbuVPdZ rQHg3RarLPUHeZENjRnR1Ijgf2/4i5x54rn/B5BZfnrUwb2Tg6ZBx25oGFuAGVJInfT6sybwG09rU +hV/OpCH73Hkm1K/CxbREvXRMcUKQzq/OR0bZiMeG6cFaMl0Ep98NKtw2Q8apZz51xwF5yXkPwcRs vh0PMXDrIZl36KRVHvYw==; 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 1f44dz-0006rg-9o; Thu, 05 Apr 2018 13:09:35 +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 1f44dt-0006jg-M7 for linux-arm-kernel@lists.infradead.org; Thu, 05 Apr 2018 13:09:33 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id EBD0860F72; Thu, 5 Apr 2018 13:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522933765; bh=WvWtNJ7D1e9Z7pMkvaoJqLb2RqCyjA7HcmGNL9KudJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1ZZiyqfbgLZmI6HzVwRV2c/5gqqtg59hZZQmf2AJl/QXwIUbgISakleecQaHzf4Y D3rEwCLZ0OHY1ads05tBh3v7Qtmm8qNh+/Pvtz8i9IvPQo2ITqCdawNzM4YIlQLHxp FR4XC5rOR0Xm8in86WhdL9+UkdI5JR6COnphurK8= 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 6656360274; Thu, 5 Apr 2018 13:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1522933764; bh=WvWtNJ7D1e9Z7pMkvaoJqLb2RqCyjA7HcmGNL9KudJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nd9DfYzz2re158+gu+qTxgeEs53Dfielb8zUVzkwth6YgQtQVSGvvSXQ/DsIq9FWZ V0tCrAHZ4mrRmh7HOaQcNun6C8enKZOtwMl8VRZVN9bcZANqGKS38c8MZmaI2P4n4q A5ScEwn2Fn+TBJH7oHfuZqxc4qHHJq+gEANjNM6c= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6656360274 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 Subject: [PATCH v4 5/5] io: change inX() to have their own IO barrier overrides Date: Thu, 5 Apr 2018 09:09:13 -0400 Message-Id: <1522933753-19589-5-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1522933753-19589-1-git-send-email-okaya@codeaurora.org> References: <1522933753-19589-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-20180405_060929_789641_5F9F7B64 X-CRM114-Status: GOOD ( 10.92 ) 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: Sinan Kaya , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.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 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 53226d9..578b688 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -433,7 +433,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 @@ -441,7 +446,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 @@ -449,7 +459,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