From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx499LNsy9uRCZcseMx7V8D8U3m932JcnMVh/himRQSrTkpOwMcagy/vs99gEo95rfivCCf7m ARC-Seal: i=1; a=rsa-sha256; t=1522192126; cv=none; d=google.com; s=arc-20160816; b=vkYuNc2zifkvEnOylg/QxVlgox5WGwEJIjKivvD9AIdHGEyjXjwimJAvP9WDw8Bdfk QoukKivSdjG+1NwIahG+TqY6muWn0qQoEFmiyhCmWAy1k41uJQXXcD76sH+qmY5Dc0lS ixW7gECt+XzFlYdpIVYjEO6sJc9vgux+W6lqAlkAEBoA1xGvI/rCCF1LwqXPbMp9DhGM fo1IxwwPFUZMeemr2pg+FFLh9ztMTQ/qUKMY87l+mAIYCMjSBANzDCJAx8PKqkSj+gXI 8MIW5nqfwJkvK6Md0wwniKtDT3Xy5SnjL91YzRaHUIHg5Zq42eAHYKa8QI+CjbiX6j4s qCUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=subject:references:in-reply-to:message-id:date:cc:to:from :arc-authentication-results; bh=5r7BVSMWLPf1poCuDJ+n+Y1NCPOdkr/DoAWOECkhpH0=; b=KHUlmst81rMLI+r5fmsaJ+CZ+CYWIZLFw49dYLlLGi0ygm6lffbQ7HgVc7Xf6pR0ip RKczfxWAb5WBtg6gsoE4zXBZ2KSkbTocBcc2h7FqOIf//t1n1ujC1g0AH9yMIoEFM+sA UDnX3VuUZ/1VCjjrpfmUJPP1RTJLF8ZKGNJN4lszjvG9Rsxk/14V3nljymvey+sjRDwp yhxqlwFBU5nxWIzBClEL/N3AMRrM1/5AtJXQyXzLkIpuoRiSl6hLNaPym4+WfNCVMoEE UoAfjh+cSosfikE/zYLtQqtnr/ek/50gogpCl2eaaEnzXQVlMD61yGYlE7KRTWt0/Kg9 llCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gunthorp@deltatee.com designates 207.54.116.67 as permitted sender) smtp.mailfrom=gunthorp@deltatee.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of gunthorp@deltatee.com designates 207.54.116.67 as permitted sender) smtp.mailfrom=gunthorp@deltatee.com From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-ntb@googlegroups.com, linux-crypto@vger.kernel.org, Greg Kroah-Hartman Cc: Arnd Bergmann , Andy Shevchenko , =?UTF-8?q?Horia=20Geant=C4=83?= , Logan Gunthorpe Date: Tue, 27 Mar 2018 17:08:32 -0600 Message-Id: <20180327230834.5931-8-logang@deltatee.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180327230834.5931-1-logang@deltatee.com> References: <20180327230834.5931-1-logang@deltatee.com> X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-ntb@googlegroups.com, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-crypto@vger.kernel.org, gregkh@linuxfoundation.org, arnd@arndb.de, andy.shevchenko@gmail.com, horia.geanta@nxp.com, logang@deltatee.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH v15 7/9] ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1596134131397218327?= X-GMAIL-MSGID: =?utf-8?q?1596134131397218327?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Now that ioread64 and iowrite64 are available in io-64-nonatomic, we can remove the hack at the top of ntb_hw_intel.c and replace it with an include. Signed-off-by: Logan Gunthorpe Reviewed-by: Andy Shevchenko Acked-by: Dave Jiang Acked-by: Allen Hubbe Acked-by: Jon Mason --- drivers/ntb/hw/intel/ntb_hw_intel.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c index 156b45cd4a19..5cf40ab21366 100644 --- a/drivers/ntb/hw/intel/ntb_hw_intel.c +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c @@ -59,6 +59,7 @@ #include #include #include +#include #include "ntb_hw_intel.h" @@ -149,35 +150,6 @@ MODULE_PARM_DESC(xeon_b2b_dsd_bar5_addr32, static inline enum ntb_topo xeon_ppd_topo(struct intel_ntb_dev *ndev, u8 ppd); static int xeon_init_isr(struct intel_ntb_dev *ndev); -#ifndef ioread64 -#ifdef readq -#define ioread64 readq -#else -#define ioread64 _ioread64 -static inline u64 _ioread64(void __iomem *mmio) -{ - u64 low, high; - - low = ioread32(mmio); - high = ioread32(mmio + sizeof(u32)); - return low | (high << 32); -} -#endif -#endif - -#ifndef iowrite64 -#ifdef writeq -#define iowrite64 writeq -#else -#define iowrite64 _iowrite64 -static inline void _iowrite64(u64 val, void __iomem *mmio) -{ - iowrite32(val, mmio); - iowrite32(val >> 32, mmio + sizeof(u32)); -} -#endif -#endif - static inline int pdev_is_xeon(struct pci_dev *pdev) { switch (pdev->device) { -- 2.11.0