Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbdFVRR4 (ORCPT ); Thu, 22 Jun 2017 13:17:56 -0400 Received: from mga11.intel.com ([192.55.52.93]:24615 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752289AbdFVRRw (ORCPT ); Thu, 22 Jun 2017 13:17:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,373,1493708400"; d="scan'208";a="118103790" From: "Jiang, Dave" To: Logan Gunthorpe , "linux-kernel@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-ntb@googlegroups.com" , "linux-alpha@vger.kernel.org" , "linuxppc-dev@lists.ozlabs.org" , "linux-crypto@vger.kernel.org" , "dri-devel@lists.freedesktop.org" CC: Arnd Bergmann , Greg Kroah-Hartman , Stephen Bates , Jon Mason , Allen Hubbe Subject: RE: [PATCH 5/7] ntb: ntb_hw_intel: remove ioread64 and iowrite64 hacks Thread-Topic: [PATCH 5/7] ntb: ntb_hw_intel: remove ioread64 and iowrite64 hacks Thread-Index: AQHS63eEyT/Y8oKEak2j2404seL1i6IxH7gg Date: Thu, 22 Jun 2017 17:17:46 +0000 Message-ID: <112A412BB11A1242B37129D931BCE53472F8DFF5@fmsmsx116.amr.corp.intel.com> References: <20170622164817.25515-1-logang@deltatee.com> <20170622164817.25515-6-logang@deltatee.com> In-Reply-To: <20170622164817.25515-6-logang@deltatee.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGFmMTY4OWQtNGE0MS00ZmFhLWE2MjItMTY5MGFiNGM4ZjFkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6InlBV095U2dSeE9EUnVkeVYwS01OR3hEcVBuYVJxVCttUWhEdzFpV2laQ1E9In0= x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: request-justification,no-action x-originating-ip: [10.1.200.107] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id v5MHI4Qk006229 Content-Length: 3045 Lines: 84 > -----Original Message----- > From: linux-ntb@googlegroups.com [mailto:linux-ntb@googlegroups.com] On Behalf Of Logan Gunthorpe > Sent: Thursday, June 22, 2017 9:48 AM > To: linux-kernel@vger.kernel.org; linux-arch@vger.kernel.org; linux-ntb@googlegroups.com; linux-alpha@vger.kernel.org; linuxppc- > dev@lists.ozlabs.org; linux-crypto@vger.kernel.org; dri-devel@lists.freedesktop.org > Cc: Arnd Bergmann ; Greg Kroah-Hartman ; Stephen Bates ; > Logan Gunthorpe ; Jon Mason ; Jiang, Dave ; Allen Hubbe > > Subject: [PATCH 5/7] ntb: ntb_hw_intel: remove ioread64 and iowrite64 hacks > > Now that ioread64 and iowrite64 are available generically we can > remove the hack at the top of ntb_hw_intel.c that patches them in > when they are not available. > > Signed-off-by: Logan Gunthorpe > Cc: Jon Mason > Cc: Dave Jiang > Cc: Allen Hubbe Thanks for doing this Logan. Acked-by: Dave Jiang > --- > drivers/ntb/hw/intel/ntb_hw_intel.c | 30 ------------------------------ > 1 file changed, 30 deletions(-) > > diff --git a/drivers/ntb/hw/intel/ntb_hw_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c > index c00238491673..56221d540c2b 100644 > --- a/drivers/ntb/hw/intel/ntb_hw_intel.c > +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c > @@ -153,35 +153,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_atom(struct pci_dev *pdev) > { > switch (pdev->device) { > @@ -3008,4 +2979,3 @@ static void __exit intel_ntb_pci_driver_exit(void) > debugfs_remove_recursive(debugfs_dir); > } > module_exit(intel_ntb_pci_driver_exit); > - > -- > 2.11.0 > > -- > You received this message because you are subscribed to the Google Groups "linux-ntb" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-ntb+unsubscribe@googlegroups.com. > To post to this group, send email to linux-ntb@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/20170622164817.25515-6- > logang%40deltatee.com. > For more options, visit https://groups.google.com/d/optout.