Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1690541

RE: [PATCH v4 4/5] ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks

Show all headers | View raw

From: Logan Gunthorpe
> 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 <logang@deltatee.com>
> Cc: Jon Mason <jdmason@kudzu.us>
> Cc: Allen Hubbe <Allen.Hubbe@emc.com>
> Acked-by: Dave Jiang <dave.jiang@intel.com>

Acked-by: Allen Hubbe <Allen.Hubbe@dell.com>

> ---
>  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 2557e2c05b90..606c90f59d4b 100644
> --- a/drivers/ntb/hw/intel/ntb_hw_intel.c
> +++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
> @@ -59,6 +59,7 @@
>  #include <linux/random.h>
>  #include <linux/slab.h>
>  #include <linux/ntb.h>
> +#include <linux/io-64-nonatomic-lo-hi.h>
> 
>  #include "ntb_hw_intel.h"
> 
> @@ -155,35 +156,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) {
> --
> 2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/5] make io{read|write}64 globally usable Logan Gunthorpe <logang@deltatee.com> - 2017-07-18 19:00 +0200
  [PATCH v4 2/5] iomap: introduce io{read|write}64_{lo_hi|hi_lo} Logan Gunthorpe <logang@deltatee.com> - 2017-07-18 19:00 +0200
  [PATCH v4 3/5] io-64-nonatomic: add io{read|write}64[be]{_lo_hi|_hi_lo} macros Logan Gunthorpe <logang@deltatee.com> - 2017-07-18 19:00 +0200
  [PATCH v4 4/5] ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks Logan Gunthorpe <logang@deltatee.com> - 2017-07-18 19:00 +0200
    RE: [PATCH v4 4/5] ntb: ntb_hw_intel: use io-64-nonatomic instead of in-driver hacks "Allen Hubbe" <Allen.Hubbe@dell.com> - 2017-07-18 20:00 +0200
  [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can use readq/writeq defs Logan Gunthorpe <logang@deltatee.com> - 2017-07-18 19:00 +0200
    Re: [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can use readq/writeq defs Michael Ellerman <mpe@ellerman.id.au> - 2017-07-19 08:00 +0200
      Re: [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can  use readq/writeq defs Logan Gunthorpe <logang@deltatee.com> - 2017-07-19 18:10 +0200
        Re: [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can  use readq/writeq defs Horia Geantă <horia.geanta@nxp.com> - 2017-07-20 12:30 +0200
          Re: [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can  use readq/writeq defs Horia Geantă <horia.geanta@nxp.com> - 2017-07-20 14:40 +0200
            Re: [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can  use readq/writeq defs Logan Gunthorpe <logang@deltatee.com> - 2017-07-20 17:50 +0200
        Re: [PATCH v4 1/5] powerpc: io.h: move iomap.h include so that it can use readq/writeq defs Michael Ellerman <mpe@ellerman.id.au> - 2017-07-20 13:20 +0200

csiph-web