Skip to content

Commit

Permalink
dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq()
Browse files Browse the repository at this point in the history
There are already helper functions to do 64-bit I/O on 32-bit machines, thus we
don't need to reinvent the wheel. In our case we can't use readq() / writeq()
even on 64-bit kernel since there is a hardware limitation (OCP bus is a 32-bit
bus).

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Andy Shevchenko authored and Vinod Koul committed Sep 25, 2015
1 parent 2e9b55b commit 97c37ac
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/dma/idma64.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <linux/spinlock.h>
#include <linux/types.h>

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

#include "virt-dma.h"

/* Channel registers */
Expand Down Expand Up @@ -166,19 +168,13 @@ static inline void idma64c_writel(struct idma64_chan *idma64c, int offset,

static inline u64 idma64c_readq(struct idma64_chan *idma64c, int offset)
{
u64 l, h;

l = idma64c_readl(idma64c, offset);
h = idma64c_readl(idma64c, offset + 4);

return l | (h << 32);
return lo_hi_readq(idma64c->regs + offset);
}

static inline void idma64c_writeq(struct idma64_chan *idma64c, int offset,
u64 value)
{
idma64c_writel(idma64c, offset, value);
idma64c_writel(idma64c, offset + 4, value >> 32);
lo_hi_writeq(value, idma64c->regs + offset);
}

#define channel_readq(idma64c, reg) \
Expand Down

0 comments on commit 97c37ac

Please sign in to comment.