> -----Original Message----- > From: linux-ntb@xxxxxxxxxxxxxxxx [mailto:linux-ntb@xxxxxxxxxxxxxxxx] On Behalf Of Logan Gunthorpe > Sent: Thursday, June 22, 2017 9:48 AM > To: linux-kernel@xxxxxxxxxxxxxxx; linux-arch@xxxxxxxxxxxxxxx; linux-ntb@xxxxxxxxxxxxxxxx; linux-alpha@xxxxxxxxxxxxxxx; linuxppc- > dev@xxxxxxxxxxxxxxxx; linux-crypto@xxxxxxxxxxxxxxx; dri-devel@xxxxxxxxxxxxxxxxxxxxx > Cc: Arnd Bergmann <arnd@xxxxxxxx>; Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>; Stephen Bates <sbates@xxxxxxxxxxxx>; > Logan Gunthorpe <logang@xxxxxxxxxxxx>; Jon Mason <jdmason@xxxxxxxx>; Jiang, Dave <dave.jiang@xxxxxxxxx>; Allen Hubbe > <Allen.Hubbe@xxxxxxx> > 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 <logang@xxxxxxxxxxxx> > Cc: Jon Mason <jdmason@xxxxxxxx> > Cc: Dave Jiang <dave.jiang@xxxxxxxxx> > Cc: Allen Hubbe <Allen.Hubbe@xxxxxxx> Thanks for doing this Logan. Acked-by: Dave Jiang <dave.jiang@xxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxxx. > To post to this group, send email to linux-ntb@xxxxxxxxxxxxxxxx. > 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.
