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: 10323649 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 2B597601A1 for ; Wed, 4 Apr 2018 23:59:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B4202904D for ; Wed, 4 Apr 2018 23:59:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F5B72907C; Wed, 4 Apr 2018 23:59:59 +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 8480D2904D for ; Wed, 4 Apr 2018 23:59:58 +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=leK6XbKRaD1OX71Ko8DXugk+uLRVeiOO9JoX6ztCrVs=; b=W2kvoPhaQsV4h+ 7HurZw8gWd8y3hWg/01pjC2TCEh7axDmo2D5k3a3t/jnTJwv/2dsj6FgGFCviSu4FD2qDBlTt4jXo y2NdXEc5vICspiE0gjJrMtWasM1zAIOYLCMK9jVdVyGpRBlb1P/Tc0Tj180Fo9d5d1uSawXRUIc+s eVwat5patKPp1E3R9CjjrLhmSApBsyVito0o0AkuCafqxFf+pTOaw4m4I69+z6ZhFtaQAc0JBxlGn v3nO6RXDJVxEw5d8Z9og27hSyk+/zB4fur9j/WTpttyUmrImsE7cMy6yPuEBLGCHHm0rsgVvvUGPK IlOyOp0Gy0VRwrum5tRQ==; 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 1f3sJg-0004A8-Lo; Wed, 04 Apr 2018 23:59:48 +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 1f3sIW-0003UX-Qu for linux-arm-kernel@lists.infradead.org; Wed, 04 Apr 2018 23:58:40 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4966360F92; 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180404_165836_959792_9E82C478 X-CRM114-Status: GOOD ( 11.36 ) 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 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