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: 10324549 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 7E1966032A for ; Thu, 5 Apr 2018 13:09:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E4A628E71 for ; Thu, 5 Apr 2018 13:09:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6289F28F69; Thu, 5 Apr 2018 13:09:37 +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 D3CE028E71 for ; Thu, 5 Apr 2018 13:09:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751534AbeDENJ1 (ORCPT ); Thu, 5 Apr 2018 09:09:27 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:38510 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbeDENJZ (ORCPT ); Thu, 5 Apr 2018 09:09:25 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3A9F960F71; Thu, 5 Apr 2018 13:09:25 +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 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 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 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 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