Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0795ccde authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Greg Kroah-Hartman
Browse files

ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks 



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: default avatarLogan Gunthorpe <logang@deltatee.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarDave Jiang <dave.jiang@intel.com>
Acked-by: default avatarAllen Hubbe <Allen.Hubbe@dell.com>
Acked-by: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c81d64d3

drivers/ntb/hw/intel/ntb_hw_intel.h

+1 −29
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


#include <linux/ntb.h>

#include <linux/pci.h>

#include <linux/io-64-nonatomic-lo-hi.h>



/* PCI device IDs */

#define PCI_DEVICE_ID_INTEL_NTB_B2B_JSF	0x3725
@@ -218,33 +219,4 @@ static inline int pdev_is_gen3(struct pci_dev *pdev) 
	return 0;

}



#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



#endif