lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v15 7/9] 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: Logan Gunthorpe <logang@deltatee.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Acked-by: Dave Jiang <dave.jiang@intel.com>
    Acked-by: Allen Hubbe <Allen.Hubbe@dell.com>
    Acked-by: Jon Mason <jdmason@kudzu.us>
    ---
    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 <linux/random.h>
    #include <linux/slab.h>
    #include <linux/ntb.h>
    +#include <linux/io-64-nonatomic-lo-hi.h>

    #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
    \
     
     \ /
      Last update: 2018-03-28 01:11    [W:2.531 / U:0.304 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site